Backport fixes for git-perltools split
cover Backport fixes for git-perltools split
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
Signature · 1 line
1.9.3
PATCH 1/2 packagegroup-self-hosted: add git-perltools
From: Jackie Huang <[email protected]>
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)
--- meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +1 -0
@@ -120,6 +120,7 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ gettext \ gettext-runtime \ git \ + git-perltools \ grep \ groff \ gzip \
Signature · 1 line
1.9.3
PATCH 2/2 buildtools-tarball: restore missing git tools
In reply to Paul EggletonSince 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)
--- 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
meta/recipes-core/meta/buildtools-tarball.bb +4 -0
@@ -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}"
meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb new file +19 -0
@@ -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}') +} +
Signature · 1 line
1.9.3
Quoted 11 lines · 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-contribpaule/dizzy-git-tools
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/dizzy-git-toolsJackie 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.
Quoted 3 lines
Paul Eggleton (1):
buildtools-tarball: restore missing git tools
This patch is already in the dizzy queue.
see poky-contrib akuster/dizzy_1_7_1.
- armin
Quoted 7 lines
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
Hi Armin,
Quoted 2 lines · On Tuesday 30 December 2014 10:17:05 akuster wrote:
Quoted 1 line · Paul Eggleton
The following changes since commit
1cf1edcd28a002291622d04dd2d0ee2c67e329e4:
Quoted 10 lines
Quoted 9 lines
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
Quoted 2 lines
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
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Hello Paul,
Quoted 16 lines · Paul Eggleton
Hi Armin,
Quoted 2 lines · On Tuesday 30 December 2014 10:17:05 akuster wrote:
Quoted 1 line · Paul Eggleton
The following changes since commit
1cf1edcd28a002291622d04dd2d0ee2c67e329e4:Quoted 10 lines
Quoted 9 lines
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
Quoted 7 lines
Quoted 2 lines
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
Quoted 4 lines
Cheers,
Paul
Paul,
I submitted this for 1.7.1 inclusion.
- armin
Quoted 21 lines · 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-contribpaule/dizzy-git-tools
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/dizzy-git-toolsJackie Huang (1):
packagegroup-self-hosted: add git-perltoolsPaul Eggleton (1):
buildtools-tarball: restore missing git toolsmeta/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