drop rust-installer.bbclass

This is only necessary for installations of rust so move the actual
functional bits into the do_install() phase of rust.
This commit is contained in:
Doug Goldstein
2016-01-21 15:06:06 -06:00
parent 03496f658f
commit 6083dff0b6
5 changed files with 6 additions and 18 deletions

View File

@@ -1,15 +0,0 @@
# Rust installer isn't very nice and drops a bunch of junk in our filesystem,
# clean it up after the install.
rust_installer_do_install () {
rm ${D}/${libdir}/rustlib/install.log
rm ${D}/${libdir}/rustlib/rust-installer-version
rm ${D}/${libdir}/rustlib/uninstall.sh
rm ${D}/${libdir}/rustlib/components
}
do_install_append () {
rust_installer_do_install
}
EXPORT_FUNCTIONS rust_installer_do_install

View File

@@ -1,6 +1,5 @@
inherit cargo
inherit patch
inherit rust-installer
SUMMARY = "Cargo downloads your Rust project's dependencies and builds your project"
HOMEPAGE = "http://crates.io"

View File

@@ -403,6 +403,12 @@ rust_do_install () {
# Remove any files directly installed into libdir to avoid
# conflicts between cross and native
rm -f ${D}${libdir}/lib*.so
# cleanup after rust-installer since we don't need these bits
rm ${D}/${libdir}/rustlib/install.log
rm ${D}/${libdir}/rustlib/rust-installer-version
rm ${D}/${libdir}/rustlib/uninstall.sh
rm ${D}/${libdir}/rustlib/components
}
do_install () {

View File

@@ -1,4 +1,3 @@
inherit rust-installer
require rust.inc
require rust-source-${PV}.inc

View File

@@ -1,4 +1,3 @@
inherit rust-installer
require rust.inc
require rust-source-${PV}.inc