On Wed, Sep 14, 2016 at 1:34 AM, Wang Xin <[email protected]> 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 <[email protected]> > --- > ...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 > [email protected] > https://lists.yoctoproject.org/listinfo/meta-virtualization -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
