diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-10-29 10:43:34 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-10-29 10:43:34 +0100 |
| commit | 2012861d8154cd0241d8a3e1ab57b485006284dc (patch) | |
| tree | 2d0a30200cf0752301ac25f5e35cd27d399941f4 /recipes/x-load | |
| parent | 1ca106793e669980354fa9c32fe931bb7a72b070 (diff) | |
| parent | 31c440b89cf2f9002bc8df2f69a34b4948f0d0de (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/x-load')
| -rw-r--r-- | recipes/x-load/x-load-omap3pandora_git.bb | 21 | ||||
| -rw-r--r-- | recipes/x-load/x-load.inc | 8 | ||||
| -rw-r--r-- | recipes/x-load/x-load_git.bb | 1 |
3 files changed, 29 insertions, 1 deletions
diff --git a/recipes/x-load/x-load-omap3pandora_git.bb b/recipes/x-load/x-load-omap3pandora_git.bb new file mode 100644 index 0000000000..c19b719592 --- /dev/null +++ b/recipes/x-load/x-load-omap3pandora_git.bb @@ -0,0 +1,21 @@ +require x-load.inc + +COMPATIBLE_MACHINE = "omap3-pandora" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/x-load-${MACHINE}/${MACHINE}" + +SRCREV = "ea866e76420f629614ae3fc828f1525a77e051e8" + +PROVIDES = "x-load" + +PV = "1.42+${PR}+gitr${SRCREV}" +PR ="r1" +PE = "1" + +SRC_URI = "git://git.openpandora.org/pandora-x-loader.git;branch=master;protocol=git" + +S = "${WORKDIR}/git" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +XLOAD_MACHINE = "pandora_config" diff --git a/recipes/x-load/x-load.inc b/recipes/x-load/x-load.inc index 01db413b12..a340958d7e 100644 --- a/recipes/x-load/x-load.inc +++ b/recipes/x-load/x-load.inc @@ -13,6 +13,8 @@ XLOAD_MACHINE ?= "${MACHINE}_config" XLOAD_IMAGE ?= "x-load-${MACHINE}-${PV}-${PR}.bin.ift" XLOAD_SYMLINK ?= "x-load-${MACHINE}.bin.ift" +XLOAD_USB_IMAGE ?= "x-load-usb-${MACHINE}-${PV}-${PR}.bin" +XLOAD_USB_SYMLINK ?= "x-load-usb-${MACHINE}.bin" MLO_IMAGE ?= "MLO-${MACHINE}-${PV}-${PR}" MLO_SYMLINK ?= "MLO-${MACHINE}" @@ -29,18 +31,22 @@ do_deploy () { signGP ${S}/x-load.bin install -d ${DEPLOY_DIR_IMAGE} install ${S}/x-load.bin.ift ${DEPLOY_DIR_IMAGE}/${XLOAD_IMAGE} + install ${S}/x-load.bin ${DEPLOY_DIR_IMAGE}/${XLOAD_USB_IMAGE} install ${S}/x-load.bin.ift ${DEPLOY_DIR_IMAGE}/${MLO_IMAGE} package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${XLOAD_IMAGE} + package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${XLOAD_USB_IMAGE} package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${MLO_IMAGE} cd ${DEPLOY_DIR_IMAGE} rm -f ${XLOAD_SYMLINK} ln -sf ${XLOAD_IMAGE} ${XLOAD_SYMLINK} + rm -f ${XLOAD_USB_SYMLINK} + ln -sf ${XLOAD_USB_IMAGE} ${XLOAD_USB_SYMLINK} rm -f ${MLO_SYMLINK} ln -sf ${MLO_IMAGE} ${MLO_SYMLINK} package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${XLOAD_SYMLINK} + package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${XLOAD_USB_SYMLINK} package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${MLO_SYMLINK} } do_deploy[dirs] = "${S}" addtask deploy before do_build after do_compile - diff --git a/recipes/x-load/x-load_git.bb b/recipes/x-load/x-load_git.bb index a369f4e3c9..3368fce52f 100644 --- a/recipes/x-load/x-load_git.bb +++ b/recipes/x-load/x-load_git.bb @@ -1,6 +1,7 @@ require x-load.inc DEFAULT_PREFERENCE_omap3517-evm = "-1" +DEFAULT_PREFERENCE_omap3-pandora = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/x-load-git/${MACHINE}" |