diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-12-05 18:09:28 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-19 17:54:14 +0000 |
| commit | 5b051d65e797624cca3a81fc6f5c924925f3493e (patch) | |
| tree | 0dda39eb50731ed3b130fd57eaa32a738e5e7b74 /meta/recipes-core | |
| parent | 90904ef3bab182a46174f7bb60e83f0f22a3f209 (diff) | |
| download | openembedded-core-contrib-5b051d65e797624cca3a81fc6f5c924925f3493e.tar.gz | |
buildtools-tarball: restore missing git tools
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].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/meta/buildtools-tarball.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb | 19 |
2 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 58e0ffa4f22..302510c7988 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 00000000000..d971c3ca3db --- /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}') +} + |