* ][PATCH] tgt: 1.0.63 -> 1.0.67
@ 2016-09-14 5:34 Wang Xin
2016-09-14 17:44 ` Mark Asselstine
0 siblings, 1 reply; 4+ messages in thread
From: Wang Xin @ 2016-09-14 5:34 UTC (permalink / raw)
To: meta-virtualization
1) Upgrade tgt from 1.0.63 to 1.0.67.
2) Modify one patch, since the data has been changed.
0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com>
---
| 13 +++++++------
meta-openstack/recipes-support/tgt/tgt_git.bb | 6 +++---
2 files changed, 10 insertions(+), 9 deletions(-)
--git a/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch b/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
index 6106b90..b371378 100644
--- a/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
+++ b/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
@@ -21,21 +21,22 @@ diff --git a/usr/Makefile b/usr/Makefile
index 453eb1a..191503d 100644
--- a/usr/Makefile
+++ b/usr/Makefile
-@@ -1,10 +1,10 @@
+@@ -1,11 +1,11 @@
sbindir ?= $(PREFIX)/sbin
-
+ libdir ?= $(PREFIX)/lib/tgt
+
-ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),)
+ifneq ($(shell test -e $(SYSROOT)/usr/include/linux/signalfd.h && echo 1),)
CFLAGS += -DUSE_SIGNALFD
endif
--ifneq ($(shell test -e /usr/include/sys/timerfd.h && echo 1),)
-+ifneq ($(shell test -e $(SYSROOT)/usr/include/sys/timerfd.h && echo 1),)
+-ifneq ($(shell test -n $(shell find /usr/include -name "timerfd.h" | head -n1) && echo 1),)
++ifneq ($(shell test -n $(shell find $(SYSROOT)/usr/include -name "timerfd.h" | head -n1) && echo 1),)
CFLAGS += -DUSE_TIMERFD
endif
-@@ -18,7 +18,7 @@ TGTD_OBJS += bs_rbd.o
- LIBS += -lrados -lrbd
+@@ -25,7 +25,7 @@ ifneq ($(SD_NOTIFY),)
+ CFLAGS += -DUSE_TIMERFD
endif
-ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),)
diff --git a/meta-openstack/recipes-support/tgt/tgt_git.bb b/meta-openstack/recipes-support/tgt/tgt_git.bb
index ac240f0..0fc70fd 100644
--- a/meta-openstack/recipes-support/tgt/tgt_git.bb
+++ b/meta-openstack/recipes-support/tgt/tgt_git.bb
@@ -4,10 +4,10 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://scripts/tgtd.spec;beginline=7;endline=7;md5=21c19ea7dad04648b9c2f791b6e29b4c"
DEPENDS = "sg3-utils"
-SRCREV = "eca74a72d2595f126a020111943928c3ea9e6fe8"
-PV = "1.0.63+git${SRCPV}"
+SRCREV = "cb7971cfeecaa43c15eed4719dc82516d7e87b6c"
+PV = "1.0.67+git${SRCPV}"
-SRC_URI = "git://github.com/fujita/tgt.git \
+SRC_URI = "git://github.com/fujita/tgt.git;protocol=https;\
file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch \
file://0001-usr-Makefile-WARNING-fix.patch \
"
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: ][PATCH] tgt: 1.0.63 -> 1.0.67
2016-09-14 5:34 ][PATCH] tgt: 1.0.63 -> 1.0.67 Wang Xin
@ 2016-09-14 17:44 ` Mark Asselstine
2016-09-19 4:54 ` ][PATCH v2] " Wang Xin
0 siblings, 1 reply; 4+ messages in thread
From: Mark Asselstine @ 2016-09-14 17:44 UTC (permalink / raw)
To: Wang Xin; +Cc: meta-virtualization
On Wed, Sep 14, 2016 at 1:34 AM, Wang Xin
<wangxin2015.fnst@cn.fujitsu.com> wrote:
> 1) Upgrade tgt from 1.0.63 to 1.0.67.
> 2) Modify one patch, since the data has been changed.
> 0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
>
> Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com>
> ---
> ...rrect-the-path-of-header-files-check-in-Yocto-buil.patch | 13 +++++++------
> meta-openstack/recipes-support/tgt/tgt_git.bb | 6 +++---
> 2 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch b/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
> index 6106b90..b371378 100644
> --- a/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
> +++ b/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
> @@ -21,21 +21,22 @@ diff --git a/usr/Makefile b/usr/Makefile
> index 453eb1a..191503d 100644
> --- a/usr/Makefile
> +++ b/usr/Makefile
> -@@ -1,10 +1,10 @@
> +@@ -1,11 +1,11 @@
> sbindir ?= $(PREFIX)/sbin
> -
> + libdir ?= $(PREFIX)/lib/tgt
> +
> -ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),)
> +ifneq ($(shell test -e $(SYSROOT)/usr/include/linux/signalfd.h && echo 1),)
> CFLAGS += -DUSE_SIGNALFD
> endif
>
> --ifneq ($(shell test -e /usr/include/sys/timerfd.h && echo 1),)
> -+ifneq ($(shell test -e $(SYSROOT)/usr/include/sys/timerfd.h && echo 1),)
> +-ifneq ($(shell test -n $(shell find /usr/include -name "timerfd.h" | head -n1) && echo 1),)
> ++ifneq ($(shell test -n $(shell find $(SYSROOT)/usr/include -name "timerfd.h" | head -n1) && echo 1),)
> CFLAGS += -DUSE_TIMERFD
> endif
>
> -@@ -18,7 +18,7 @@ TGTD_OBJS += bs_rbd.o
> - LIBS += -lrados -lrbd
> +@@ -25,7 +25,7 @@ ifneq ($(SD_NOTIFY),)
> + CFLAGS += -DUSE_TIMERFD
> endif
>
> -ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),)
> diff --git a/meta-openstack/recipes-support/tgt/tgt_git.bb b/meta-openstack/recipes-support/tgt/tgt_git.bb
> index ac240f0..0fc70fd 100644
> --- a/meta-openstack/recipes-support/tgt/tgt_git.bb
> +++ b/meta-openstack/recipes-support/tgt/tgt_git.bb
> @@ -4,10 +4,10 @@ LICENSE = "GPLv2"
> LIC_FILES_CHKSUM = "file://scripts/tgtd.spec;beginline=7;endline=7;md5=21c19ea7dad04648b9c2f791b6e29b4c"
> DEPENDS = "sg3-utils"
>
> -SRCREV = "eca74a72d2595f126a020111943928c3ea9e6fe8"
> -PV = "1.0.63+git${SRCPV}"
> +SRCREV = "cb7971cfeecaa43c15eed4719dc82516d7e87b6c"
> +PV = "1.0.67+git${SRCPV}"
>
> -SRC_URI = "git://github.com/fujita/tgt.git \
> +SRC_URI = "git://github.com/fujita/tgt.git;protocol=https;\
We have a lot of recipes which use git and github and do not require
the "protocol=https" attribute. What is going on here that this is
needed, just out of curiousity.
Mark
> file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch \
> file://0001-usr-Makefile-WARNING-fix.patch \
> "
> --
> 2.7.4
>
>
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization
^ permalink raw reply [flat|nested] 4+ messages in thread* ][PATCH v2] tgt: 1.0.63 -> 1.0.67
2016-09-14 17:44 ` Mark Asselstine
@ 2016-09-19 4:54 ` Wang Xin
2016-09-19 20:08 ` Bruce Ashfield
0 siblings, 1 reply; 4+ messages in thread
From: Wang Xin @ 2016-09-19 4:54 UTC (permalink / raw)
To: meta-virtualization
Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com>
---
| 13 +++++++------
meta-openstack/recipes-support/tgt/tgt_git.bb | 4 ++--
2 files changed, 9 insertions(+), 8 deletions(-)
--git a/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch b/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
index 6106b90..6630163 100644
--- a/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
+++ b/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
@@ -21,21 +21,22 @@ diff --git a/usr/Makefile b/usr/Makefile
index 453eb1a..191503d 100644
--- a/usr/Makefile
+++ b/usr/Makefile
-@@ -1,10 +1,10 @@
+@@ -1,11 +1,11 @@
sbindir ?= $(PREFIX)/sbin
-
+ libdir ?= $(PREFIX)/lib/tgt
+
-ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),)
+ifneq ($(shell test -e $(SYSROOT)/usr/include/linux/signalfd.h && echo 1),)
CFLAGS += -DUSE_SIGNALFD
endif
--ifneq ($(shell test -e /usr/include/sys/timerfd.h && echo 1),)
-+ifneq ($(shell test -e $(SYSROOT)/usr/include/sys/timerfd.h && echo 1),)
+-ifneq ($(shell test -n $(shell find /usr/include -name "timerfd.h" | head -n1) && echo 1),)
++ifneq ($(shell test -n $(shell find $(SYSROOT)/usr/include -name "timerfd.h" | head -n1) && echo 1),)
CFLAGS += -DUSE_TIMERFD
endif
-@@ -18,7 +18,7 @@ TGTD_OBJS += bs_rbd.o
- LIBS += -lrados -lrbd
+@@ -25,7 +25,7 @@ TGTD_OBJS += bs_rbd.o
+ CFLAGS += -DUSE_TIMERFD
endif
-ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),)
diff --git a/meta-openstack/recipes-support/tgt/tgt_git.bb b/meta-openstack/recipes-support/tgt/tgt_git.bb
index ac240f0..af4aa4b 100644
--- a/meta-openstack/recipes-support/tgt/tgt_git.bb
+++ b/meta-openstack/recipes-support/tgt/tgt_git.bb
@@ -4,8 +4,8 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://scripts/tgtd.spec;beginline=7;endline=7;md5=21c19ea7dad04648b9c2f791b6e29b4c"
DEPENDS = "sg3-utils"
-SRCREV = "eca74a72d2595f126a020111943928c3ea9e6fe8"
-PV = "1.0.63+git${SRCPV}"
+SRCREV = "cb7971cfeecaa43c15eed4719dc82516d7e87b6c"
+PV = "1.0.67+git${SRCPV}"
SRC_URI = "git://github.com/fujita/tgt.git \
file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch \
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: ][PATCH v2] tgt: 1.0.63 -> 1.0.67
2016-09-19 4:54 ` ][PATCH v2] " Wang Xin
@ 2016-09-19 20:08 ` Bruce Ashfield
0 siblings, 0 replies; 4+ messages in thread
From: Bruce Ashfield @ 2016-09-19 20:08 UTC (permalink / raw)
To: Wang Xin; +Cc: meta-virtualization
[-- Attachment #1: Type: text/plain, Size: 3375 bytes --]
On Mon, Sep 19, 2016 at 12:54 AM, Wang Xin <wangxin2015.fnst@cn.fujitsu.com>
wrote:
> Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com>
>
I didn't see an answer to the question about protocol = https, but I see
that it is gone
in v2.
The shortlog was also not quite right for this .. as well as the long log
being dropped.
I fixed the shortlog, and copied the v1 long log, so I could merge this
change.
Cheers,
Bruce
> ---
> ...rrect-the-path-of-header-files-check-in-Yocto-buil.patch | 13
> +++++++------
> meta-openstack/recipes-support/tgt/tgt_git.bb | 4 ++--
> 2 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/meta-openstack/recipes-support/tgt/files/0001-
> Correct-the-path-of-header-files-check-in-Yocto-buil.patch
> b/meta-openstack/recipes-support/tgt/files/0001-
> Correct-the-path-of-header-files-check-in-Yocto-buil.patch
> index 6106b90..6630163 100644
> --- a/meta-openstack/recipes-support/tgt/files/0001-
> Correct-the-path-of-header-files-check-in-Yocto-buil.patch
> +++ b/meta-openstack/recipes-support/tgt/files/0001-
> Correct-the-path-of-header-files-check-in-Yocto-buil.patch
> @@ -21,21 +21,22 @@ diff --git a/usr/Makefile b/usr/Makefile
> index 453eb1a..191503d 100644
> --- a/usr/Makefile
> +++ b/usr/Makefile
> -@@ -1,10 +1,10 @@
> +@@ -1,11 +1,11 @@
> sbindir ?= $(PREFIX)/sbin
> -
> + libdir ?= $(PREFIX)/lib/tgt
> +
> -ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),)
> +ifneq ($(shell test -e $(SYSROOT)/usr/include/linux/signalfd.h && echo
> 1),)
> CFLAGS += -DUSE_SIGNALFD
> endif
>
> --ifneq ($(shell test -e /usr/include/sys/timerfd.h && echo 1),)
> -+ifneq ($(shell test -e $(SYSROOT)/usr/include/sys/timerfd.h && echo 1),)
> +-ifneq ($(shell test -n $(shell find /usr/include -name "timerfd.h" |
> head -n1) && echo 1),)
> ++ifneq ($(shell test -n $(shell find $(SYSROOT)/usr/include -name
> "timerfd.h" | head -n1) && echo 1),)
> CFLAGS += -DUSE_TIMERFD
> endif
>
> -@@ -18,7 +18,7 @@ TGTD_OBJS += bs_rbd.o
> - LIBS += -lrados -lrbd
> +@@ -25,7 +25,7 @@ TGTD_OBJS += bs_rbd.o
> + CFLAGS += -DUSE_TIMERFD
> endif
>
> -ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e
> /usr/include/libaio.h && echo 1),)
> diff --git a/meta-openstack/recipes-support/tgt/tgt_git.bb
> b/meta-openstack/recipes-support/tgt/tgt_git.bb
> index ac240f0..af4aa4b 100644
> --- a/meta-openstack/recipes-support/tgt/tgt_git.bb
> +++ b/meta-openstack/recipes-support/tgt/tgt_git.bb
> @@ -4,8 +4,8 @@ LICENSE = "GPLv2"
> LIC_FILES_CHKSUM = "file://scripts/tgtd.spec;beginline=7;endline=7;md5=
> 21c19ea7dad04648b9c2f791b6e29b4c"
> DEPENDS = "sg3-utils"
>
> -SRCREV = "eca74a72d2595f126a020111943928c3ea9e6fe8"
> -PV = "1.0.63+git${SRCPV}"
> +SRCREV = "cb7971cfeecaa43c15eed4719dc82516d7e87b6c"
> +PV = "1.0.67+git${SRCPV}"
>
> SRC_URI = "git://github.com/fujita/tgt.git \
> file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
> \
> --
> 2.7.4
>
>
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
[-- Attachment #2: Type: text/html, Size: 5164 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-09-19 20:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-14 5:34 ][PATCH] tgt: 1.0.63 -> 1.0.67 Wang Xin
2016-09-14 17:44 ` Mark Asselstine
2016-09-19 4:54 ` ][PATCH v2] " Wang Xin
2016-09-19 20:08 ` Bruce Ashfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.