diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2013-08-07 10:40:27 +0000 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-08-07 10:32:14 -0300 |
commit | 3e5a4b51a9cc45c761a7666316b6abaaf460c595 (patch) | |
tree | 01223f9e63b5a85dd9266c2b1fec31294faff7f0 /recipes-bsp/barebox | |
parent | 3cf4f4de20d01e58559908e25008acdd19955bb3 (diff) | |
download | meta-fsl-arm-3e5a4b51a9cc45c761a7666316b6abaaf460c595.tar.gz |
barebox: move environment deployment to its own task
Introduce a new task ito deploy the environment to allow inheriting
recipes to override it.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'recipes-bsp/barebox')
-rw-r--r-- | recipes-bsp/barebox/barebox.inc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/recipes-bsp/barebox/barebox.inc b/recipes-bsp/barebox/barebox.inc index e52b463..00595cc 100644 --- a/recipes-bsp/barebox/barebox.inc +++ b/recipes-bsp/barebox/barebox.inc | |||
@@ -39,13 +39,10 @@ do_compile () { | |||
39 | do_deploy () { | 39 | do_deploy () { |
40 | install -d ${DEPLOY_DIR_IMAGE} | 40 | install -d ${DEPLOY_DIR_IMAGE} |
41 | install ${S}/${BAREBOX_BINARY} ${DEPLOY_DIR_IMAGE}/${BAREBOX_IMAGE} | 41 | install ${S}/${BAREBOX_BINARY} ${DEPLOY_DIR_IMAGE}/${BAREBOX_IMAGE} |
42 | install ${S}/barebox_default_env ${DEPLOY_DIR_IMAGE}/${BAREBOXENV_BIN} | ||
43 | 42 | ||
44 | cd ${DEPLOY_DIR_IMAGE} | 43 | cd ${DEPLOY_DIR_IMAGE} |
45 | rm -f ${BAREBOX_SYMLINK} | 44 | rm -f ${BAREBOX_SYMLINK} |
46 | rm -f ${BAREBOXENV_SYMLINK} | ||
47 | ln -sf ${BAREBOX_IMAGE} ${BAREBOX_SYMLINK} | 45 | ln -sf ${BAREBOX_IMAGE} ${BAREBOX_SYMLINK} |
48 | ln -sf ${BAREBOXENV_BIN} ${BAREBOXENV_SYMLINK} | ||
49 | 46 | ||
50 | install -d ${STAGING_BINDIR_NATIVE} | 47 | install -d ${STAGING_BINDIR_NATIVE} |
51 | cd ${S} | 48 | cd ${S} |
@@ -55,3 +52,12 @@ do_deploy () { | |||
55 | 52 | ||
56 | do_deploy[dirs] = "${S}" | 53 | do_deploy[dirs] = "${S}" |
57 | addtask deploy before do_build after do_compile | 54 | addtask deploy before do_build after do_compile |
55 | |||
56 | do_env_deploy() { | ||
57 | install ${S}/barebox_default_env ${DEPLOY_DIR_IMAGE}/${BAREBOXENV_BIN} | ||
58 | |||
59 | cd ${DEPLOY_DIR_IMAGE} | ||
60 | rm -f ${BAREBOXENV_SYMLINK} | ||
61 | ln -sf ${BAREBOXENV_BIN} ${BAREBOXENV_SYMLINK} | ||
62 | } | ||
63 | addtask env_deploy before do_build after do_deploy | ||