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 | |||
23 | 23 | ||
24 | PSTAGE_NATIVEDEPENDS = "\ | 24 | PSTAGE_NATIVEDEPENDS = "\ |
25 | shasum-native \ | 25 | shasum-native \ |
26 | stagemanager-native \ | ||
27 | " | 26 | " |
28 | 27 | ||
29 | BB_STAMP_WHITELIST = "${PSTAGE_NATIVEDEPENDS}" | 28 | BB_STAMP_WHITELIST = "${PSTAGE_NATIVEDEPENDS}" |
@@ -63,10 +62,6 @@ python () { | |||
63 | # Add task dependencies if we're active, otherwise mark packaged staging | 62 | # Add task dependencies if we're active, otherwise mark packaged staging |
64 | # as inactive. | 63 | # as inactive. |
65 | if pstage_allowed: | 64 | if pstage_allowed: |
66 | deps = bb.data.getVarFlag('do_setscene', 'depends', d) or "" | ||
67 | deps += " stagemanager-native:do_populate_sysroot" | ||
68 | bb.data.setVarFlag('do_setscene', 'depends', deps, d) | ||
69 | |||
70 | policy = bb.data.getVar("BB_STAMP_POLICY", d, True) | 65 | policy = bb.data.getVar("BB_STAMP_POLICY", d, True) |
71 | if policy == "whitelist" or policy == "full": | 66 | if policy == "whitelist" or policy == "full": |
72 | deps = bb.data.getVarFlag('do_setscene', 'recrdeptask', d) or "" | 67 | 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 @@ | |||
1 | DESCRIPTION = "Helper script for packaged-staging.bbclass" | ||
2 | PR = "r9" | ||
3 | |||
4 | SRC_URI = "file://stage-manager \ | ||
5 | file://stage-manager-ipkg \ | ||
6 | file://stage-manager-ipkg-build " | ||
7 | LICENSE = "GPLv2" | ||
8 | |||
9 | PACKAGE_ARCH = "all" | ||
10 | |||
11 | inherit native | ||
12 | |||
13 | DEPENDS = " " | ||
14 | PACKAGE_DEPENDS = " " | ||
15 | PATCHDEPENDENCY = "" | ||
16 | INHIBIT_DEFAULT_DEPS = "1" | ||
17 | |||
18 | PSTAGING_DISABLED = "1" | ||
19 | |||
20 | # This function is special and allowed to onstall into staging directly | ||
21 | do_install() { | ||
22 | install -d ${STAGING_BINDIR} | ||
23 | install -m 0755 ${WORKDIR}/stage-manager ${STAGING_BINDIR} | ||
24 | install -m 0755 ${WORKDIR}/stage-manager-ipkg ${STAGING_BINDIR} | ||
25 | install -m 0755 ${WORKDIR}/stage-manager-ipkg-build ${STAGING_BINDIR} | ||
26 | } | ||
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 | |||