merged. Bruce
On Fri, Aug 7, 2015 at 5:14 AM, Lei Maohui <[email protected]> wrote: > Signed-off-by: Lei Maohui <[email protected]> > --- > .../chef/chef/0001-chang-ksh-to-sh.patch | 23 > ++++++++++++++++++++++ > meta-openstack/recipes-support/chef/chef_git.bb | 14 +++++++------ > 2 files changed, 31 insertions(+), 6 deletions(-) > create mode 100644 > meta-openstack/recipes-support/chef/chef/0001-chang-ksh-to-sh.patch > > diff --git > a/meta-openstack/recipes-support/chef/chef/0001-chang-ksh-to-sh.patch > b/meta-openstack/recipes-support/chef/chef/0001-chang-ksh-to-sh.patch > new file mode 100644 > index 0000000..b3d13fc > --- /dev/null > +++ b/meta-openstack/recipes-support/chef/chef/0001-chang-ksh-to-sh.patch > @@ -0,0 +1,23 @@ > +From b819187d45984b4bc37aebc41570a7f4fff94b14 Mon Sep 17 00:00:00 2001 > +From: Lei Maohui <[email protected]> > +Date: Tue, 4 Aug 2015 03:56:28 +0900 > +Subject: [PATCH] chang ksh to sh > + > +Signed-off-by: Lei Maohui <[email protected]> > +--- > + spec/functional/assets/chefinittest | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/spec/functional/assets/chefinittest > b/spec/functional/assets/chefinittest > +index 79e064c..46a7c3b 100755 > +--- a/spec/functional/assets/chefinittest > ++++ b/spec/functional/assets/chefinittest > +@@ -1,4 +1,4 @@ > +-#!/bin/ksh > ++#!/bin/sh > + > + function create_chef_txt { > + touch /tmp/chefinittest.txt > +-- > +1.8.4.2 > + > diff --git a/meta-openstack/recipes-support/chef/chef_git.bb > b/meta-openstack/recipes-support/chef/chef_git.bb > index c8a422b..86e4165 100644 > --- a/meta-openstack/recipes-support/chef/chef_git.bb > +++ b/meta-openstack/recipes-support/chef/chef_git.bb > @@ -11,17 +11,15 @@ LIC_FILES_CHKSUM = > "file://LICENSE;md5=8f7bb094c7232b058c7e9f2e431f389c" > > PR = "r0" > > -#SRC_URI[md5sum] = "521d9184648b12e0ea331367d287314f" > -#SRC_URI[sha256sum] > ="d00874468a4f9e43d6acb0d5238a50ebb4c79f17fd502741a0fc83d76eb253cf" > - > -BPV = "11.12.4" > +BPV = "12.4.1" > PV = "${BPV}" > -SRCREV = "410af3e88cf9f0793c56363563be8fa173244d3a" > +SRCREV = "1dc20627aa5d742376269dc5b4d5c67f34d08008" > > S = "${WORKDIR}/git" > > SRC_URI = " \ > - git://github.com/opscode/chef.git;branch=11-stable \ > + git://github.com/opscode/chef.git;branch=12.4-stable \ > + file://0001-chang-ksh-to-sh.patch \ > " > > inherit ruby > @@ -61,10 +59,14 @@ RDEPENDS_${PN} += " \ > systemu \ > yajl-ruby \ > make \ > + bash \ > " > > RUBY_INSTALL_GEMS = "pkg/chef-${BPV}.gem" > > +FILES_${PN} += "${libdir}/ruby/gems/2.2.0/build_info" > +FILES_${PN} += "${libdir}/ruby/gems/2.2.0/extensions" > + > do_install_prepend() { > rake gem > } > -- > 1.8.4.2 > > -- > _______________________________________________ > meta-virtualization mailing list > [email protected] > https://lists.yoctoproject.org/listinfo/meta-virtualization -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
