diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-09 13:32:21 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-09 13:32:21 +0100 |
| commit | 1bdb5922351e73cbe42000c55b5d4458371eb9c0 (patch) | |
| tree | 625faadc2d18d670d7465637da493b0ca11b3ce6 /package/drbd | |
| parent | 23bc64ab05f3f152903c127d0bd24de681dc2044 (diff) | |
| parent | cb02beee5de8c85d2956e2f205d74eeced28416d (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/drbd')
| -rw-r--r-- | package/drbd/patches/patch-Makefile_in | 10 | ||||
| -rw-r--r-- | package/drbd/patches/patch-drbd_Makefile | 12 |
2 files changed, 16 insertions, 6 deletions
diff --git a/package/drbd/patches/patch-Makefile_in b/package/drbd/patches/patch-Makefile_in index 71ece3f6f..ad87d221d 100644 --- a/package/drbd/patches/patch-Makefile_in +++ b/package/drbd/patches/patch-Makefile_in @@ -1,9 +1,11 @@ --- drbd-8.3.10.orig/Makefile.in 2011-01-26 14:57:59.000000000 +0100 -+++ drbd-8.3.10/Makefile.in 2011-05-23 17:11:50.000000000 +0200 -@@ -56,7 +56,7 @@ KDIR ?= /lib/modules/$(KVER)/build - # and not in e.g. dash. I'm too lazy to fix it to be compatible. - SHELL=/bin/bash ++++ drbd-8.3.10/Makefile.in 2011-10-23 10:20:12.000000000 +0200 +@@ -54,9 +54,7 @@ KDIR ?= /lib/modules/$(KVER)/build + # for some reason some of the commands below only work correctly in bash, + # and not in e.g. dash. I'm too lazy to fix it to be compatible. +-SHELL=/bin/bash +- -SUBDIRS = user scripts documentation drbd +SUBDIRS = user scripts drbd diff --git a/package/drbd/patches/patch-drbd_Makefile b/package/drbd/patches/patch-drbd_Makefile index dffd1e258..62f61cab4 100644 --- a/package/drbd/patches/patch-drbd_Makefile +++ b/package/drbd/patches/patch-drbd_Makefile @@ -1,6 +1,14 @@ --- drbd-8.3.10.orig/drbd/Makefile 2011-01-26 14:57:59.000000000 +0100 -+++ drbd-8.3.10/drbd/Makefile 2011-05-23 17:11:50.000000000 +0200 -@@ -133,7 +133,7 @@ else ++++ drbd-8.3.10/drbd/Makefile 2011-10-23 10:22:50.000000000 +0200 +@@ -65,7 +65,6 @@ else + + # for some reason some of the commands below only work correctly in bash, + # and not in e.g. dash. I'm too lazy to fix it to be compatible. +- SHELL=/bin/bash + + DRBDSRC := $(shell pwd) + +@@ -133,7 +132,7 @@ else grep return $@ ; \ fi ; \ echo -e "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}"; \ |