Browse Source

[ipvsadm2] Improved the way we enable the availability of 'ip_vs.h' header

Instead of simply copying the 'ip_vs.h' header file we apply a patch that
assures the installation of a 'sanitized' version while building the
linux-header package.
early
Christian Wiese 17 years ago
parent
commit
eb1fde8024
  1. 37
      network/ipvsadm2/linux-header-install-ip_vs.h.diff
  2. 6
      network/ipvsadm2/pkg_linux-header_pre.conf

37
network/ipvsadm2/linux-header-install-ip_vs.h.diff

@ -0,0 +1,37 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../ipvsadm2/linux-header-install-ip_vs.h.diff
# Copyright (C) 2008 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Author: Christian Wiese <morfoh@opensde.org>
Origin: OpenSDE (http://opensde.org)
Description: Install a 'sanitized' version of the ip_vs.h header file
to satisfy ipvsadm2 and keepalived.
diff -ruN linux-2.6.22.orig/include/Kbuild linux-2.6.22/include/Kbuild
--- linux-2.6.22.orig/include/Kbuild 2007-07-09 02:32:17.000000000 +0300
+++ linux-2.6.22/include/Kbuild 2008-03-13 20:33:16.000000000 +0200
@@ -3,6 +3,7 @@
header-y += scsi/
header-y += sound/
header-y += mtd/
+header-y += net/
header-y += rdma/
header-y += video/
diff -ruN linux-2.6.22.orig/include/net/Kbuild linux-2.6.22/include/net/Kbuild
--- linux-2.6.22.orig/include/net/Kbuild 1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.22/include/net/Kbuild 2008-03-13 20:35:34.000000000 +0200
@@ -0,0 +1 @@
+unifdef-y += ip_vs.h

6
network/ipvsadm2/pkg_linux-header_pre.conf

@ -2,6 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../ipvsadm2/pkg_linux-header_pre.conf # Filename: package/.../ipvsadm2/pkg_linux-header_pre.conf
# Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
@ -11,6 +12,9 @@
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING. # GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END --- # --- SDE-COPYRIGHT-NOTE-END ---
pkg_ipvsadm2_confdir=$base/package/*/ipvsadm2
if ! atstage toolchain; then if ! atstage toolchain; then
hook_add postmake 5 'cp -v include/net/ip_vs.h $root/usr/include/net/' var_append patchfiles ' ' "$pkg_ipvsadm2_confdir/linux-header-install-ip_vs.h.diff"
fi fi

Loading…
Cancel
Save