From 2d2c06984f77d899acb3e02b8583a586aeb874e9 Mon Sep 17 00:00:00 2001
From: Aldas Nabazas <aldas@opensde.net>
Date: Tue, 23 Nov 2010 13:51:02 +0100
Subject: [PATCH] drbd: Updated (8.0.11 -> 8.3.8.1), removed kernel hacks ,
 it's in mainline kernel since 2.6.33

---
 cluster/drbd/drbd.desc                  |  6 ++---
 cluster/drbd/pkg_linux-header_post.conf | 15 -----------
 cluster/drbd/pkg_linux26_post.conf      | 15 -----------
 cluster/drbd/pkg_linux_post.conf        | 35 -------------------------
 4 files changed, 3 insertions(+), 68 deletions(-)
 delete mode 100644 cluster/drbd/pkg_linux-header_post.conf
 delete mode 100644 cluster/drbd/pkg_linux26_post.conf
 delete mode 100644 cluster/drbd/pkg_linux_post.conf

diff --git a/cluster/drbd/drbd.desc b/cluster/drbd/drbd.desc
index 534e7bab8..1e0bb4467 100644
--- a/cluster/drbd/drbd.desc
+++ b/cluster/drbd/drbd.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../drbd/drbd.desc
-[COPY] Copyright (C) 2008 The OpenSDE Project
+[COPY] Copyright (C) 2008 - 2010 The OpenSDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
 [COPY]
@@ -27,7 +27,7 @@
 
 [L] GPL
 [S] Stable
-[V] 8.0.11
+[V] 8.3.8.1
 [P] X -----5---9 800.000
 
-[D] 60454849 drbd-8.0.11.tar.gz http://oss.linbit.com/drbd/8.0/
+[D] 3411654640 drbd-8.3.8.1.tar.gz http://oss.linbit.com/drbd/8.3/
diff --git a/cluster/drbd/pkg_linux-header_post.conf b/cluster/drbd/pkg_linux-header_post.conf
deleted file mode 100644
index 3eca76354..000000000
--- a/cluster/drbd/pkg_linux-header_post.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../drbd/pkg_linux-header_post.conf
-# Copyright (C) 2008 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-. $base/package/*/drbd/pkg_linux_post.conf
diff --git a/cluster/drbd/pkg_linux26_post.conf b/cluster/drbd/pkg_linux26_post.conf
deleted file mode 100644
index 720469f0d..000000000
--- a/cluster/drbd/pkg_linux26_post.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../drbd/pkg_linux26_post.conf
-# Copyright (C) 2008 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-. $base/package/*/drbd/pkg_linux_post.conf
diff --git a/cluster/drbd/pkg_linux_post.conf b/cluster/drbd/pkg_linux_post.conf
deleted file mode 100644
index ac5a54751..000000000
--- a/cluster/drbd/pkg_linux_post.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../drbd/pkg_linux_post.conf
-# Copyright (C) 2008 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-# get the drbd version
-pkg_drbd_ver=$( pkgdesc ver drbd )
-
-pkg_drbd_kernel_ver="linux-$( echo $ver | cut -d '.' -f1-3 )-drbd-$pkg_drbd_ver"
-
-# get the name of the drbd source tarball
-pkg_drbd_srctar=`match_source_file -p drbd-.*tar.* drbd`
-
-echo_status "Including DRBD ($pkg_drbd_ver) support"
-
-# create a temporary directory where we unpack drbd sources
-pkg_drbd_tempdir=`mktemp -d`
-tar $taropt $pkg_drbd_srctar -C $pkg_drbd_tempdir
-
-pkg_drbd_prepatch() {
-	eval make -C "$pkg_drbd_tempdir/drbd-$pkg_drbd_ver KDIR=$PWD kernel-patch"
-	# we create our own patch file from the original one
-	cat "$pkg_drbd_tempdir/drbd-$pkg_drbd_ver/patch-$pkg_drbd_kernel_ver" > "$pkg_drbd_tempdir/$pkg_drbd_kernel_ver.patch"
-	var_append patchfiles ' ' "$pkg_drbd_tempdir/$pkg_drbd_kernel_ver.patch"
-}
-hook_add prepatch 5 'pkg_drbd_prepatch'