From 897a8b5abc3ce3af89c78aa4ce4522487c75f38c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 22 Jul 2010 11:41:00 +0100 Subject: [PATCH] stagemanager: Move functionality into the scripts directory Since scripts is now in PATH thanks to the layer functionality there is no longer any need to have this recipe full of special cases, the scripts can just be placed there. Signed-off-by: Richard Purdie --- meta/classes/packaged-staging.bbclass | 5 ---- .../stagemanager-native_0.0.1.bb | 26 ------------------- .../files => scripts}/stage-manager | 0 .../files => scripts}/stage-manager-ipkg | 0 .../stage-manager-ipkg-build | 0 5 files changed, 31 deletions(-) delete mode 100644 meta/packages/stage-manager/stagemanager-native_0.0.1.bb rename {meta/packages/stage-manager/files => scripts}/stage-manager (100%) rename {meta/packages/stage-manager/files => scripts}/stage-manager-ipkg (100%) rename {meta/packages/stage-manager/files => scripts}/stage-manager-ipkg-build (100%) diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass index bd2dc1652c..fe4d938709 100644 --- a/meta/classes/packaged-staging.bbclass +++ b/meta/classes/packaged-staging.bbclass @@ -23,7 +23,6 @@ PSTAGE_SCAN_CMD ?= "find ${PSTAGE_TMPDIR_STAGE} \( -name "*.la" -o -name "*-conf PSTAGE_NATIVEDEPENDS = "\ shasum-native \ - stagemanager-native \ " BB_STAMP_WHITELIST = "${PSTAGE_NATIVEDEPENDS}" @@ -63,10 +62,6 @@ python () { # Add task dependencies if we're active, otherwise mark packaged staging # as inactive. if pstage_allowed: - deps = bb.data.getVarFlag('do_setscene', 'depends', d) or "" - deps += " stagemanager-native:do_populate_sysroot" - bb.data.setVarFlag('do_setscene', 'depends', deps, d) - policy = bb.data.getVar("BB_STAMP_POLICY", d, True) if policy == "whitelist" or policy == "full": deps = bb.data.getVarFlag('do_setscene', 'recrdeptask', d) or "" diff --git a/meta/packages/stage-manager/stagemanager-native_0.0.1.bb b/meta/packages/stage-manager/stagemanager-native_0.0.1.bb deleted file mode 100644 index d6c1b8cf52..0000000000 --- a/meta/packages/stage-manager/stagemanager-native_0.0.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Helper script for packaged-staging.bbclass" -PR = "r9" - -SRC_URI = "file://stage-manager \ - file://stage-manager-ipkg \ - file://stage-manager-ipkg-build " -LICENSE = "GPLv2" - -PACKAGE_ARCH = "all" - -inherit native - -DEPENDS = " " -PACKAGE_DEPENDS = " " -PATCHDEPENDENCY = "" -INHIBIT_DEFAULT_DEPS = "1" - -PSTAGING_DISABLED = "1" - -# This function is special and allowed to onstall into staging directly -do_install() { - install -d ${STAGING_BINDIR} - install -m 0755 ${WORKDIR}/stage-manager ${STAGING_BINDIR} - install -m 0755 ${WORKDIR}/stage-manager-ipkg ${STAGING_BINDIR} - install -m 0755 ${WORKDIR}/stage-manager-ipkg-build ${STAGING_BINDIR} -} diff --git a/meta/packages/stage-manager/files/stage-manager b/scripts/stage-manager similarity index 100% rename from meta/packages/stage-manager/files/stage-manager rename to scripts/stage-manager diff --git a/meta/packages/stage-manager/files/stage-manager-ipkg b/scripts/stage-manager-ipkg similarity index 100% rename from meta/packages/stage-manager/files/stage-manager-ipkg rename to scripts/stage-manager-ipkg diff --git a/meta/packages/stage-manager/files/stage-manager-ipkg-build b/scripts/stage-manager-ipkg-build similarity index 100% rename from meta/packages/stage-manager/files/stage-manager-ipkg-build rename to scripts/stage-manager-ipkg-build