* [PATCH v3] u-boot.inc: fix rename image error
@ 2015-03-09 7:24 Chunrong Guo
2015-03-09 16:29 ` Otavio Salvador
0 siblings, 1 reply; 2+ messages in thread
From: Chunrong Guo @ 2015-03-09 7:24 UTC (permalink / raw)
To: openembedded-core
Resolve mismatch between U-Boot configs and uboot image name.
The ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} may alway be false
and repeat compile or install so we need to check if ${type} match ${config} .
Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
meta/recipes-bsp/u-boot/u-boot.inc | 52 ++++++++------------------------------
1 file changed, 11 insertions(+), 41 deletions(-)
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 6bdc86a..27fa809 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -62,19 +62,13 @@ do_compile () {
echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion
echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
fi
-
+
if [ "x${UBOOT_CONFIG}" != "x" ]
then
for config in ${UBOOT_MACHINE}; do
- for type in in ${UBOOT_CONFIG}; do
- if [ "${type}"x = "in"x ]
- then
- continue
- fi
- if [ -d "${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX}" ]
+ for type in ${UBOOT_CONFIG}; do
+ if [ "`echo ${config} | cut -d'_' -f2`" = "${type}" ]
then
- break
- else
oe_runmake O=${config} ${config}
oe_runmake O=${config} ${UBOOT_MAKE_TARGET}
cp ${S}/${config}/${UBOOT_BINARY} ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX}
@@ -92,15 +86,9 @@ do_install () {
if [ "x${UBOOT_CONFIG}" != "x" ]
then
for config in ${UBOOT_MACHINE}; do
- for type in in ${UBOOT_CONFIG}; do
- if [ "${type}"x = "in"x ]
- then
- continue
- fi
- if [ -d "${D}/boot/u-boot-${type}.${UBOOT_SUFFIX}" ]
+ for type in ${UBOOT_CONFIG}; do
+ if [ "`echo ${config} | cut -d'_' -f2`" = "${type}" ]
then
- break
- else
install -d ${D}/boot
install ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${D}/boot/u-boot-${type}.${UBOOT_SUFFIX}
ln -sf u-boot-${type}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY}
@@ -123,15 +111,9 @@ do_install () {
if [ "x${UBOOT_CONFIG}" != "x" ]
then
for config in ${UBOOT_MACHINE}; do
- for type in in ${UBOOT_CONFIG}; do
- if [ "${type}"x = "in"x ]
+ for type in ${UBOOT_CONFIG}; do
+ if [ "`echo ${config} | cut -d'_' -f2`" = "${type}" ]
then
- continue
- fi
- if [ -d "${D}/boot/${SPL_IMAGE}-${type}" ]
- then
- break
- else
install ${S}/${config}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}-${type}
ln -sf ${SPL_IMAGE}-${type} ${D}/boot/${SPL_BINARY}-${type}
ln -sf ${SPL_IMAGE}-${type} ${D}/boot/${SPL_BINARY}
@@ -157,15 +139,9 @@ do_deploy () {
if [ "x${UBOOT_CONFIG}" != "x" ]
then
for config in ${UBOOT_MACHINE}; do
- for type in in ${UBOOT_CONFIG}; do
- if [ "${type}"x = "in"x ]
+ for type in ${UBOOT_CONFIG}; do
+ if [ "`echo ${config} | cut -d'_' -f2`" = "${type}" ]
then
- continue
- fi
- if [ -d "${DEPLOYDIR}/u-boot-${type}.${UBOOT_SUFFIX}" ]
- then
- break
- else
install -d ${DEPLOYDIR}
install ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${DEPLOYDIR}/u-boot-${type}.${UBOOT_SUFFIX}
cd ${DEPLOYDIR}
@@ -190,15 +166,9 @@ do_deploy () {
if [ "x${UBOOT_CONFIG}" != "x" ]
then
for config in ${UBOOT_MACHINE}; do
- for type in in ${UBOOT_CONFIG}; do
- if [ "${type}"x = "in"x ]
- then
- continue
- fi
- if [ -d "${DEPLOYDIR}/${SPL_IMAGE}-${type}" ]
+ for type in ${UBOOT_CONFIG}; do
+ if [ "`echo ${config} | cut -d'_' -f2`" = "${type}" ]
then
- break
- else
install ${S}/${config}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}-${type}
rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK}-${type}
ln -sf ${SPL_IMAGE}-${type} ${DEPLOYDIR}/${SPL_BINARY}-${type}
--
1.9.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] u-boot.inc: fix rename image error
2015-03-09 7:24 [PATCH v3] u-boot.inc: fix rename image error Chunrong Guo
@ 2015-03-09 16:29 ` Otavio Salvador
0 siblings, 0 replies; 2+ messages in thread
From: Otavio Salvador @ 2015-03-09 16:29 UTC (permalink / raw)
To: Chunrong Guo; +Cc: Patches and discussions about the oe-core layer
On Mon, Mar 9, 2015 at 4:24 AM, Chunrong Guo <B40290@freescale.com> wrote:
> Resolve mismatch between U-Boot configs and uboot image name.
> The ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} may alway be false
> and repeat compile or install so we need to check if ${type} match ${config} .
>
> Signed-off-by: Chunrong Guo <B40290@freescale.com>
I think we have a serious issue here:
+ echo mx6qsabresd_config
+ cut -d_ -f2
+ [ config = sd ]
+ echo mx6qsabresd_sata_config
+ cut -d_ -f2
+ [ sata = sd ]
+ echo mx6qsabresd_config
+ cut -d_ -f2
+ [ config = sata ]
+ echo mx6qsabresd_sata_config
+ cut -d_ -f2
+ [ sata = sata ]
+ oe_runmake O=mx6qsabresd_sata_config mx6qsabresd_sata_config
+ oe_runmake_call O=mx6qsabresd_sata_config mx6qsabresd_sata_config
This is wrong. It shouldn't expect a pattern in the UBOOT_MACHINE
value. Instead it should match the UBOOT_CONFIG for it and done.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-09 16:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-09 7:24 [PATCH v3] u-boot.inc: fix rename image error Chunrong Guo
2015-03-09 16:29 ` Otavio Salvador
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.