diff options
author | Li xin <lixin.fnst@cn.fujitsu.com> | 2015-07-29 18:05:14 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-07-29 11:12:01 -0400 |
commit | 824f453c088e69f03b7a917d53561d7f75c1bf07 (patch) | |
tree | 1d0753b3a03a43cadd7f14d6c41563028ec819ad /meta-openstack/recipes-support | |
parent | ba67a3bc3138b44378ac5f5063b690ac10e4294b (diff) | |
download | meta-cloud-services-824f453c088e69f03b7a917d53561d7f75c1bf07.tar.gz |
tgt: upgrade 1.0.36 -> 1.0.60
Add 0001-usr-Makefile-WARNING-fix.patch to avoid build WARNING.
Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Diffstat (limited to 'meta-openstack/recipes-support')
-rw-r--r-- | meta-openstack/recipes-support/tgt/files/0001-usr-Makefile-WARNING-fix.patch | 31 | ||||
-rw-r--r-- | meta-openstack/recipes-support/tgt/tgt_git.bb | 5 |
2 files changed, 34 insertions, 2 deletions
diff --git a/meta-openstack/recipes-support/tgt/files/0001-usr-Makefile-WARNING-fix.patch b/meta-openstack/recipes-support/tgt/files/0001-usr-Makefile-WARNING-fix.patch new file mode 100644 index 0000000..15f5482 --- /dev/null +++ b/meta-openstack/recipes-support/tgt/files/0001-usr-Makefile-WARNING-fix.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 2a336ec5bf939d86425570617471df60140d839e Mon Sep 17 00:00:00 2001 | ||
2 | From: Li xin <lixin.fnst@cn.fujitsu.com> | ||
3 | Date: Sun, 26 Jul 2015 04:23:51 +0900 | ||
4 | Subject: [PATCH] usr/Makefile: WARNING fix WARNING: QA Issue: tgt: | ||
5 | /work/i586-oe-linux/tgt/1.0.60+gitAUTOINC+ab51727a36-r0/ | ||
6 | packages-split/tgt/usr/sbin/tgtd contains probably-redundant RPATH /usr/lib | ||
7 | [useless-rpaths] | ||
8 | |||
9 | Upstream-Status: pending | ||
10 | |||
11 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> | ||
12 | --- | ||
13 | usr/Makefile | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/usr/Makefile b/usr/Makefile | ||
17 | index 1fae7e7..2db109c 100644 | ||
18 | --- a/usr/Makefile | ||
19 | +++ b/usr/Makefile | ||
20 | @@ -63,7 +63,7 @@ TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \ | ||
21 | |||
22 | TGTD_DEP = $(TGTD_OBJS:.o=.d) | ||
23 | |||
24 | -LDFLAGS = -Wl,-E,-rpath=$(libdir) | ||
25 | +LDFLAGS = -Wl,-E | ||
26 | |||
27 | .PHONY:all | ||
28 | all: $(PROGRAMS) $(MODULES) | ||
29 | -- | ||
30 | 1.8.4.2 | ||
31 | |||
diff --git a/meta-openstack/recipes-support/tgt/tgt_git.bb b/meta-openstack/recipes-support/tgt/tgt_git.bb index fe34858..a5df710 100644 --- a/meta-openstack/recipes-support/tgt/tgt_git.bb +++ b/meta-openstack/recipes-support/tgt/tgt_git.bb | |||
@@ -4,12 +4,13 @@ LICENSE = "GPLv2" | |||
4 | LIC_FILES_CHKSUM = "file://scripts/tgtd.spec;beginline=7;endline=7;md5=21c19ea7dad04648b9c2f791b6e29b4c" | 4 | LIC_FILES_CHKSUM = "file://scripts/tgtd.spec;beginline=7;endline=7;md5=21c19ea7dad04648b9c2f791b6e29b4c" |
5 | DEPENDS = "sg3-utils" | 5 | DEPENDS = "sg3-utils" |
6 | 6 | ||
7 | SRCREV = "3f779c0338fa7a97d5d0defbdb3ad06167b791d3" | 7 | SRCREV = "ab51727a361bf296b1c2036375b5e45479059921" |
8 | PV = "1.0.37+git${SRCPV}" | 8 | PV = "1.0.60+git${SRCPV}" |
9 | PR = "r0" | 9 | PR = "r0" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/fujita/tgt.git \ | 11 | SRC_URI = "git://github.com/fujita/tgt.git \ |
12 | file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch \ | 12 | file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch \ |
13 | file://0001-usr-Makefile-WARNING-fix.patch \ | ||
13 | " | 14 | " |
14 | SRC_URI += "file://tgtd.init" | 15 | SRC_URI += "file://tgtd.init" |
15 | 16 | ||