diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2018-02-22 17:19:42 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-03 17:08:28 +0000 |
| commit | d8a93d75c75bf8df40f3e167eca2fcef4f76e240 (patch) | |
| tree | ffa1a1a80aec70e3c86db8ca26a19e2471ba817d | |
| parent | f4fbdc8cc19be843f733701fc6fa2ac8cf5c3699 (diff) | |
| download | openembedded-core-d8a93d75c75bf8df40f3e167eca2fcef4f76e240.tar.gz openembedded-core-d8a93d75c75bf8df40f3e167eca2fcef4f76e240.tar.bz2 openembedded-core-d8a93d75c75bf8df40f3e167eca2fcef4f76e240.zip | |
git: 2.15.0 -> 2.16.1
Add /usr/share/git-core/templates/hooks/fsmonitor-watchman.sample to PERLTOOLS to fix:
ERROR: git-2.16.1-r0 do_package_qa: QA Issue: /usr/share/git-core/templates/hooks/fsmonitor-watchman.sample contained in package git requires /usr/bin/perl, but no providers found in RDEPENDS_git? [file-rdeps]
ERROR: git-2.16.1-r0 do_package_qa: QA run found fatal errors. Please consider fixing them.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-devtools/git/git.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/git/git_2.15.0.bb | 11 | ||||
| -rw-r--r-- | meta/recipes-devtools/git/git_2.16.1.bb | 11 |
3 files changed, 13 insertions, 11 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 9b4c1284d2..dd9d792c5c 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -116,6 +116,7 @@ PERLTOOLS = " \ ${datadir}/gitweb/gitweb.cgi \ ${datadir}/git-core/templates/hooks/prepare-commit-msg.sample \ ${datadir}/git-core/templates/hooks/pre-rebase.sample \ + ${datadir}/git-core/templates/hooks/fsmonitor-watchman.sample \ " # Git tools requiring perl @@ -125,6 +126,7 @@ FILES_${PN}-perltools += " \ ${libdir}/perl \ ${datadir}/perl \ " + RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" # git-tk package with gitk and git-gui diff --git a/meta/recipes-devtools/git/git_2.15.0.bb b/meta/recipes-devtools/git/git_2.15.0.bb deleted file mode 100644 index fd6c9310c0..0000000000 --- a/meta/recipes-devtools/git/git_2.15.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require git.inc - -EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ - ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ - " -EXTRA_OEMAKE += "NO_GETTEXT=1" - -SRC_URI[tarball.md5sum] = "1ed7298833336c1accb0a7be5a7a2b1b" -SRC_URI[tarball.sha256sum] = "25762cc50103a6a0665c46ea33ceb0578eee01c19b6a08fd393e8608ccbdb3da" -SRC_URI[manpages.md5sum] = "19a0116bcb0779e0bc997c4180018daf" -SRC_URI[manpages.sha256sum] = "3b1b9ebf02d4aa6e741becd1ed9319597488743f939fdab3b894ec52d25408ef" diff --git a/meta/recipes-devtools/git/git_2.16.1.bb b/meta/recipes-devtools/git/git_2.16.1.bb new file mode 100644 index 0000000000..9dc4eba88c --- /dev/null +++ b/meta/recipes-devtools/git/git_2.16.1.bb @@ -0,0 +1,11 @@ +require git.inc + +EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ + ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ + " +EXTRA_OEMAKE += "NO_GETTEXT=1" + +SRC_URI[tarball.md5sum] = "37467da8e79e72f28598d667f219f75e" +SRC_URI[tarball.sha256sum] = "56cfa48af2b289bba172ca0a47c29f0083f5846cf4759978b70988e4f07fc9fd" +SRC_URI[manpages.md5sum] = "5587407f3c28446af12fde3f3131ba34" +SRC_URI[manpages.sha256sum] = "d499e825f429d76862be415f579c20cc26b046573a3a39237acaf9682cb71be7" |