Re: [OE-core] [PATCH 3/4] git: 2.15.0 -> 2.16.1

2018-02-05 Thread Robert Yang 



On 02/05/2018 07:29 PM, Peter Kjellerstedt wrote:

-Original Message-
From: openembedded-core-boun...@lists.openembedded.org
[mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
Robert Yang
Sent: den 5 februari 2018 03:41
To: openembedded-core@lists.openembedded.org
Subject: [OE-core] [PATCH 3/4] git: 2.15.0 -> 2.16.1

Add RDEPENDS_${PN} += "perl" 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.y...@windriver.com>
---
  meta/recipes-devtools/git/git.inc   |  2 ++
  meta/recipes-devtools/git/git_2.15.0.bb | 11 ---
  meta/recipes-devtools/git/git_2.16.1.bb | 11 +++
  3 files changed, 13 insertions(+), 11 deletions(-)
  delete mode 100644 meta/recipes-devtools/git/git_2.15.0.bb
  create mode 100644 meta/recipes-devtools/git/git_2.16.1.bb

diff --git a/meta/recipes-devtools/git/git.inc 
b/meta/recipes-devtools/git/git.inc
index 9b4c128..4943b94 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -125,6 +125,8 @@ FILES_${PN}-perltools += " \
  ${libdir}/perl \
  ${datadir}/perl \
  "
+RDEPENDS_${PN} += "perl"


No, don't do that. Instead add the fsmonitor-watchman.sample file
to ${PERLTOOLS}, just like the other hook sample files
(prepare-commit-msg.sample and pre-rebase.sample) that are written
in Perl. That way we'll keep the perl dependency out of the main
git package.


Thanks, updated in the repo.

// Robert





  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 fd6c931..000
--- 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] = "1ed729886c1accb0a7be5a7a2b1b"
-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 000..9dc4eba
--- /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"
--
2.7.4


//peter



--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 3/4] git: 2.15.0 -> 2.16.1

2018-02-05 Thread Peter Kjellerstedt 
> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org
> [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
> Robert Yang
> Sent: den 5 februari 2018 03:41
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH 3/4] git: 2.15.0 -> 2.16.1
> 
> Add RDEPENDS_${PN} += "perl" 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.y...@windriver.com>
> ---
>  meta/recipes-devtools/git/git.inc   |  2 ++
>  meta/recipes-devtools/git/git_2.15.0.bb | 11 ---
>  meta/recipes-devtools/git/git_2.16.1.bb | 11 +++
>  3 files changed, 13 insertions(+), 11 deletions(-)
>  delete mode 100644 meta/recipes-devtools/git/git_2.15.0.bb
>  create mode 100644 meta/recipes-devtools/git/git_2.16.1.bb
> 
> diff --git a/meta/recipes-devtools/git/git.inc 
> b/meta/recipes-devtools/git/git.inc
> index 9b4c128..4943b94 100644
> --- a/meta/recipes-devtools/git/git.inc
> +++ b/meta/recipes-devtools/git/git.inc
> @@ -125,6 +125,8 @@ FILES_${PN}-perltools += " \
>  ${libdir}/perl \
>  ${datadir}/perl \
>  "
> +RDEPENDS_${PN} += "perl"

No, don't do that. Instead add the fsmonitor-watchman.sample file 
to ${PERLTOOLS}, just like the other hook sample files 
(prepare-commit-msg.sample and pre-rebase.sample) that are written 
in Perl. That way we'll keep the perl dependency out of the main 
git package.

>  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 fd6c931..000
> --- 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] = "1ed729886c1accb0a7be5a7a2b1b"
> -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 000..9dc4eba
> --- /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"
> --
> 2.7.4

//peter

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 3/4] git: 2.15.0 -> 2.16.1

2018-02-04 Thread Robert Yang 
Add RDEPENDS_${PN} += "perl" 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 
---
 meta/recipes-devtools/git/git.inc   |  2 ++
 meta/recipes-devtools/git/git_2.15.0.bb | 11 ---
 meta/recipes-devtools/git/git_2.16.1.bb | 11 +++
 3 files changed, 13 insertions(+), 11 deletions(-)
 delete mode 100644 meta/recipes-devtools/git/git_2.15.0.bb
 create mode 100644 meta/recipes-devtools/git/git_2.16.1.bb

diff --git a/meta/recipes-devtools/git/git.inc 
b/meta/recipes-devtools/git/git.inc
index 9b4c128..4943b94 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -125,6 +125,8 @@ FILES_${PN}-perltools += " \
 ${libdir}/perl \
 ${datadir}/perl \
 "
+RDEPENDS_${PN} += "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 fd6c931..000
--- 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] = "1ed729886c1accb0a7be5a7a2b1b"
-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 000..9dc4eba
--- /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"
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core