summaryrefslogtreecommitdiff
path: root/recipes-bsp
diff options
context:
space:
mode:
authorStefan Christ <s.christ@phytec.de>2015-11-05 09:46:28 +0100
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2015-11-06 14:05:30 +0100
commitb72029617426c2b473327011e033dac1912cfddf (patch)
tree1ea541b994216b555ddd270867b6a96a52dfb7e4 /recipes-bsp
parent603d96f4f62b5c2ba527906b495dc424676148eb (diff)
downloadmeta-phytec-b72029617426c2b473327011e033dac1912cfddf.tar.bz2
meta-phytec-b72029617426c2b473327011e033dac1912cfddf.zip
barebox: refactor task do_prepare_configure
Since the task do_prepare_configure is a bash script now, it can be integrated into the real do_configure task. Furthermore the task dependency to 'kconfig-frontends-native' can be an normal DEPENDS, because all DEPENDS are resolved before do_configure by default. Signed-off-by: Stefan Christ <s.christ@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
Diffstat (limited to 'recipes-bsp')
-rw-r--r--recipes-bsp/barebox/barebox.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-bsp/barebox/barebox.inc b/recipes-bsp/barebox/barebox.inc
index 697c352..134dbf8 100644
--- a/recipes-bsp/barebox/barebox.inc
+++ b/recipes-bsp/barebox/barebox.inc
@@ -29,7 +29,7 @@ inherit kernel-arch cml1 deploy
inherit kconfig-prepare-configure
# Increase INC_PR everytime the include file is changed.
-INC_PR = "r4"
+INC_PR = "r5"
PACKAGE_ARCH = "${MACHINE_ARCH}"
# verbose build 0/1
@@ -56,7 +56,7 @@ BAREBOX_MACHINE_ENVDIR = "${WORKDIR}/machineenv"
BAREBOX_BOARD_ENVDIR = "${WORKDIR}/boardenv"
-do_prepare_configure_append() {
+do_configure_append() {
bbnote "Setting LOCALVERSION in .config to ${BAREBOX_LOCALVERSION}"
kconfig-tweak --file "${S}/.config" --set-str "LOCALVERSION" "${BAREBOX_LOCALVERSION}"
@@ -100,7 +100,7 @@ python do_prepare_env() {
shutil.copyfile(workdir_far_env_bin,
os.path.join(S, ".commonenv/bin", "far"))
}
-addtask prepare_env after do_patch before do_prepare_configure
+addtask prepare_env after do_patch before do_configure
do_default_defconfig () {
bbnote "generating .config for target ${BAREBOX_DEFAULT_DEFCONFIG}"