| 1 |
alonbl 14/07/06 19:07:36 |
| 2 |
|
| 3 |
Added: bestcrypt-2.0.4-build.patch |
| 4 |
Removed: bestcrypt-1.7.0-respect_LDFLAGS.patch |
| 5 |
Log: |
| 6 |
Version bump, fix alternate kernel dir bug#514500 |
| 7 |
|
| 8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-crypt/bestcrypt/files/bestcrypt-2.0.4-build.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/bestcrypt/files/bestcrypt-2.0.4-build.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/bestcrypt/files/bestcrypt-2.0.4-build.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: bestcrypt-2.0.4-build.patch |
| 17 |
=================================================================== |
| 18 |
From 38ef9fdb4b6690825fe3e54b6b44173e00316a94 Mon Sep 17 00:00:00 2001 |
| 19 |
From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 20 |
Date: Sun, 6 Jul 2014 21:28:11 +0300 |
| 21 |
Subject: [PATCH 1/3] build: respect CFLAGS/LDFLAGS |
| 22 |
|
| 23 |
Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
| 24 |
--- |
| 25 |
Makefile | 5 +++-- |
| 26 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 27 |
|
| 28 |
diff --git a/Makefile b/Makefile |
| 29 |
index 17abf61..e89bb76 100644 |
| 30 |
--- a/Makefile |
| 31 |
+++ b/Makefile |
| 32 |
@@ -56,7 +56,8 @@ KGSHA_LIB = $(KGSHA_BUILD_DIR)/lib$(KGSHA_LIB_NAME).a |
| 33 |
KGGHOST_LIB = $(KGGHOST_BUILD_DIR)/lib$(KGGHOST_LIB_NAME).a |
| 34 |
SPACEMAP_LIB = $(SPACEMAP_BUILD_DIR)/lib$(SPACEMAP_LIB_NAME).a |
| 35 |
|
| 36 |
-BC_EXTRA_CFLAGS= -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
| 37 |
+BC_EXTRA_CFLAGS= $(CFLAGS) -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
| 38 |
+BC_EXTRA_LDFLAGS = $(LDFLAGS) |
| 39 |
|
| 40 |
# |
| 41 |
# commands |
| 42 |
@@ -86,7 +87,7 @@ BCTOOL_OBJS = container/linux/file.o \ |
| 43 |
src/bctool-rawlink.o |
| 44 |
|
| 45 |
BCTOOL_CFLAGS = $(BC_EXTRA_CFLAGS) -DBC_LINUX -Wall -I. -Icertificate/ |
| 46 |
-BCTOOL_LDFLAGS = -L$(TARGET_DIR) -l$(KERN_LIB_NAME) -l$(KGSHA_LIB_NAME) \ |
| 47 |
+BCTOOL_LDFLAGS = $(BC_EXTRA_LDFLAGS) -L$(TARGET_DIR) -l$(KERN_LIB_NAME) -l$(KGSHA_LIB_NAME) \ |
| 48 |
-l$(KGGHOST_LIB_NAME) -l$(CERT_LIB_NAME) -l$(SPACEMAP_LIB_NAME) \ |
| 49 |
-ludev -lpthread -l$(FS_LIB_NAME) |
| 50 |
|
| 51 |
-- |
| 52 |
1.8.5.5 |
| 53 |
|
| 54 |
From 632ba530d94675c62213ec9f2bd9a37a411a6050 Mon Sep 17 00:00:00 2001 |
| 55 |
From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 56 |
Date: Sun, 6 Jul 2014 21:30:49 +0300 |
| 57 |
Subject: [PATCH 2/3] build: create directories before put file + use install |
| 58 |
|
| 59 |
Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
| 60 |
--- |
| 61 |
Makefile | 5 +++-- |
| 62 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 63 |
|
| 64 |
diff --git a/Makefile b/Makefile |
| 65 |
index e89bb76..3cd36fd 100644 |
| 66 |
--- a/Makefile |
| 67 |
+++ b/Makefile |
| 68 |
@@ -238,6 +238,7 @@ uninstall: before-uninstall module-uninstall console-uninstall helpers-uninstall |
| 69 |
true |
| 70 |
|
| 71 |
helpers-install: |
| 72 |
+ install -o root -m 0755 -d $(PREFIX)/sbin |
| 73 |
install -o root -m 4755 -s $(TARGET_DIR)/bcmount_helper $(PREFIX)/sbin |
| 74 |
install -o root -m 4755 -s $(TARGET_DIR)/bcumount_helper $(PREFIX)/sbin |
| 75 |
install -o root -m 4755 -s $(TARGET_DIR)/bcrrpart_helper $(PREFIX)/sbin |
| 76 |
@@ -261,9 +262,9 @@ before-uninstall: force-look |
| 77 |
|
| 78 |
# install for console only |
| 79 |
console-install: force-look |
| 80 |
- mkdir -p $(PREFIX)/usr/bin |
| 81 |
+ install -o root -m 0755 -d $(PREFIX)/usr/bin |
| 82 |
install -o root -m 0755 -s build/bctool $(PREFIX)/usr/bin/ |
| 83 |
- mkdir -p $(PREFIX)/$(MAN_PATH)/man8 |
| 84 |
+ install -o root -m 0755 -d $(PREFIX)/$(MAN_PATH)/man8 |
| 85 |
install -m 644 bctool.8 $(PREFIX)/$(MAN_PATH)/man8/ |
| 86 |
|
| 87 |
# uninstall for console only |
| 88 |
-- |
| 89 |
1.8.5.5 |
| 90 |
|
| 91 |
From 4bce59bd9bc5a201caf5f2ff3e2080e7e5a01733 Mon Sep 17 00:00:00 2001 |
| 92 |
From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 93 |
Date: Sun, 6 Jul 2014 21:34:21 +0300 |
| 94 |
Subject: [PATCH 3/3] build: do not auto build/install module |
| 95 |
|
| 96 |
Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
| 97 |
--- |
| 98 |
Makefile | 4 ++-- |
| 99 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 100 |
|
| 101 |
diff --git a/Makefile b/Makefile |
| 102 |
index 3cd36fd..a3fd59e 100644 |
| 103 |
--- a/Makefile |
| 104 |
+++ b/Makefile |
| 105 |
@@ -98,7 +98,7 @@ TESTS_TARGET = $(TARGET_DIR)/tests/bctool-tests |
| 106 |
# |
| 107 |
|
| 108 |
# default target builds console tool with modules |
| 109 |
-all: Makefile helpers module console |
| 110 |
+all: Makefile helpers console |
| 111 |
true |
| 112 |
|
| 113 |
rebuild: clean all |
| 114 |
@@ -226,7 +226,7 @@ module-clean: force-look |
| 115 |
# |
| 116 |
|
| 117 |
# install for default target |
| 118 |
-install: module-install console-install helpers-install |
| 119 |
+install: console-install helpers-install |
| 120 |
true |
| 121 |
|
| 122 |
# used by RPM creation script |
| 123 |
-- |
| 124 |
1.8.5.5 |
Archives