[dizzy][PATCH 0/2] Backport fixes for git-perltools split

[dizzy][PATCH 0/2] Backport fixes for git-perltools split

[Paul Eggleton]

The following changes since commit 1cf1edcd28a002291622d04dd2d0ee2c67e329e4:

  buildtools-tarball: package all of Python (2014-12-11 16:34:01 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib paule/dizzy-git-tools
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/dizzy-git-tools

Jackie Huang (1):
  packagegroup-self-hosted: add git-perltools

Paul Eggleton (1):
  buildtools-tarball: restore missing git tools

 meta/recipes-core/meta/buildtools-tarball.bb          |  4 ++++
 .../meta/nativesdk-buildtools-perl-dummy.bb           | 19 +++++++++++++++++++
 .../packagegroups/packagegroup-self-hosted.bb         |  1 +
 3 files changed, 24 insertions(+)
 create mode 100644 meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb

-- 
1.9.3

[dizzy][PATCH 1/2] packagegroup-self-hosted: add git-perltools

[Paul Eggleton]

From: Jackie Huang <jackie.huang@windriver.com>

git-perltools provides some usefull git tools like:
git-submodule, git-request-pull, git-send-email, git-am, etc.

We should have it added in self-hosted image.

(From OE-Core master rev: 4b0cbdc9c94b336f3102d4cce1886842b28ce6d5)

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 65aca7f..f95ce77 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -120,6 +120,7 @@ RDEPENDS_packagegroup-self-hosted-extended = "\
     gettext \
     gettext-runtime \
     git \
+    git-perltools \
     grep \
     groff \
     gzip \
-- 
1.9.3

[dizzy][PATCH 2/2] buildtools-tarball: restore missing git tools

[Paul Eggleton]

Since the split out of git-perltools, some git tools (such as "git am",
"git send-email" and "git-submodule") have no longer been part of the
buildtools. We need these, so add them back in.

However, adding git-perltools to buildtools triggers perl itself being
brought into buildtools as well, and we don't want that; but we also
don't want to have to hack the git recipe or indeed anything else that
starts depending on perl. Thus, add a dummy package which gets installed
in its place, in a separate package architecture that is only enabled
for buildtools to ensure it doesn't start appearing in place of
nativesdk-perl anywhere else.

Fixes [YOCTO #7033].

(From OE-Core master rev: 5b051d65e797624cca3a81fc6f5c924925f3493e)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-core/meta/buildtools-tarball.bb          |  4 ++++
 .../meta/nativesdk-buildtools-perl-dummy.bb           | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb

diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb
index 58e0ffa..302510c 100644
--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-tarball.bb
@@ -15,13 +15,17 @@ TOOLCHAIN_HOST_TASK ?= "\
     nativesdk-ncurses-terminfo-base \
     nativesdk-chrpath \
     nativesdk-tar \
+    nativesdk-buildtools-perl-dummy \
     nativesdk-git \
+    nativesdk-git-perltools \
     nativesdk-pigz \
     nativesdk-make \
     nativesdk-wget \
     nativesdk-ca-certificates \
     "
 
+SDK_PACKAGE_ARCHS =+ "buildtools-dummy-${SDKPKGSUFFIX}"
+
 TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-buildtools-nativesdk-standalone-${DISTRO_VERSION}"
 
 RDEPENDS = "${TOOLCHAIN_HOST_TASK}"
diff --git a/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb b/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb
new file mode 100644
index 0000000..d971c3c
--- /dev/null
+++ b/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Dummy package which ensures perl is excluded from buildtools"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+inherit nativesdk
+
+# Put it somewhere separate to ensure it's never used except when we want it
+PACKAGE_ARCH = "buildtools-dummy-${SDKPKGSUFFIX}"
+
+PERLPACKAGES = "nativesdk-perl \
+                nativesdk-perl-module-file-path"
+
+ALLOW_EMPTY_${PN} = "1"
+
+python populate_packages_prepend() {
+    d.appendVar('RPROVIDES_${PN}', '${PERLPACKAGES}')
+    d.appendVar('RCONFLICTS_${PN}', '${PERLPACKAGES}')
+}
+
-- 
1.9.3

Re: [dizzy][PATCH 0/2] Backport fixes for git-perltools split

[akuster]

On 12/30/2014 09:02 AM, Paul Eggleton wrote:
> The following changes since commit 1cf1edcd28a002291622d04dd2d0ee2c67e329e4:
>
>    buildtools-tarball: package all of Python (2014-12-11 16:34:01 +0000)
>
> are available in the git repository at:
>
>    git://git.openembedded.org/openembedded-core-contrib paule/dizzy-git-tools
>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/dizzy-git-tools
>
> Jackie Huang (1):
>    packagegroup-self-hosted: add git-perltools

This change is in that gray area "does this really need to be back 
ported decision make processed", so I did not include it.

>
> Paul Eggleton (1):
>    buildtools-tarball: restore missing git tools

This patch is already in the dizzy queue.

http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=akuster/dizzy_1_7_1&id=e8a6adf0612fc6d9ca703237a3a5c630177c2f34

see poky-contrib akuster/dizzy_1_7_1.

- armin

>
>   meta/recipes-core/meta/buildtools-tarball.bb          |  4 ++++
>   .../meta/nativesdk-buildtools-perl-dummy.bb           | 19 +++++++++++++++++++
>   .../packagegroups/packagegroup-self-hosted.bb         |  1 +
>   3 files changed, 24 insertions(+)
>   create mode 100644 meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb
>

Re: [dizzy][PATCH 0/2] Backport fixes for git-perltools split

[Paul Eggleton]

Hi Armin,

On Tuesday 30 December 2014 10:17:05 akuster wrote:
> On 12/30/2014 09:02 AM, Paul Eggleton wrote:
> > The following changes since commit 
1cf1edcd28a002291622d04dd2d0ee2c67e329e4:
> >    buildtools-tarball: package all of Python (2014-12-11 16:34:01 +0000)
> > 
> > are available in the git repository at:
> >    git://git.openembedded.org/openembedded-core-contrib
> >    paule/dizzy-git-tools
> >    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=
> >    paule/dizzy-git-tools> 
> > Jackie Huang (1):
> >    packagegroup-self-hosted: add git-perltools
> 
> This change is in that gray area "does this really need to be back
> ported decision make processed", so I did not include it.

I would argue this is of a similar order as the other fix. The tools that the 
git-perltools package contains were in the build appliance already until git-
perltools was split out, so it's fixing a regression (though I think that 
regression happened in the 1.6 timeframe rather than 1.7 FWIW).

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [dizzy][PATCH 0/2] Backport fixes for git-perltools split

[akuster808]

Hello Paul,


On 12/30/2014 12:39 PM, Paul Eggleton wrote:
> Hi Armin,
>
> On Tuesday 30 December 2014 10:17:05 akuster wrote:
>> On 12/30/2014 09:02 AM, Paul Eggleton wrote:
>>> The following changes since commit
> 1cf1edcd28a002291622d04dd2d0ee2c67e329e4:
>>>     buildtools-tarball: package all of Python (2014-12-11 16:34:01 +0000)
>>>
>>> are available in the git repository at:
>>>     git://git.openembedded.org/openembedded-core-contrib
>>>     paule/dizzy-git-tools
>>>     http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=
>>>     paule/dizzy-git-tools>
>>> Jackie Huang (1):
>>>     packagegroup-self-hosted: add git-perltools
>>
>> This change is in that gray area "does this really need to be back
>> ported decision make processed", so I did not include it.
>
> I would argue this is of a similar order as the other fix. The tools that the
> git-perltools package contains were in the build appliance already until git-
> perltools was split out, so it's fixing a regression (though I think that
> regression happened in the 1.6 timeframe rather than 1.7 FWIW).

Thanks for the clarification.

  This should be included then.

Regards,
- -armin
>
> Cheers,
> Paul
>

Re: [dizzy][PATCH 0/2] Backport fixes for git-perltools split

[akuster808]

Paul,

I submitted this for 1.7.1 inclusion.

- armin

On 12/30/2014 09:02 AM, Paul Eggleton wrote:
> The following changes since commit 1cf1edcd28a002291622d04dd2d0ee2c67e329e4:
>
>    buildtools-tarball: package all of Python (2014-12-11 16:34:01 +0000)
>
> are available in the git repository at:
>
>    git://git.openembedded.org/openembedded-core-contrib paule/dizzy-git-tools
>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/dizzy-git-tools
>
> Jackie Huang (1):
>    packagegroup-self-hosted: add git-perltools
>
> Paul Eggleton (1):
>    buildtools-tarball: restore missing git tools
>
>   meta/recipes-core/meta/buildtools-tarball.bb          |  4 ++++
>   .../meta/nativesdk-buildtools-perl-dummy.bb           | 19 +++++++++++++++++++
>   .../packagegroups/packagegroup-self-hosted.bb         |  1 +
>   3 files changed, 24 insertions(+)
>   create mode 100644 meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb
>