diff options
| -rw-r--r-- | meta/classes/packaged-staging.bbclass | 5 | ||||
| -rw-r--r-- | meta/packages/stage-manager/stagemanager-native_0.0.1.bb | 26 | ||||
| -rwxr-xr-x | scripts/stage-manager (renamed from meta/packages/stage-manager/files/stage-manager) | 0 | ||||
| -rwxr-xr-x | scripts/stage-manager-ipkg (renamed from meta/packages/stage-manager/files/stage-manager-ipkg) | 0 | ||||
| -rwxr-xr-x | scripts/stage-manager-ipkg-build (renamed from meta/packages/stage-manager/files/stage-manager-ipkg-build) | 0 |
5 files changed, 0 insertions, 31 deletions
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 index 536d1afda0..536d1afda0 100755 --- a/meta/packages/stage-manager/files/stage-manager +++ b/scripts/stage-manager diff --git a/meta/packages/stage-manager/files/stage-manager-ipkg b/scripts/stage-manager-ipkg index 2559fdbcd8..2559fdbcd8 100755 --- a/meta/packages/stage-manager/files/stage-manager-ipkg +++ b/scripts/stage-manager-ipkg diff --git a/meta/packages/stage-manager/files/stage-manager-ipkg-build b/scripts/stage-manager-ipkg-build index 77367ac35a..77367ac35a 100755 --- a/meta/packages/stage-manager/files/stage-manager-ipkg-build +++ b/scripts/stage-manager-ipkg-build |