Skip to contentSkip to conversation

Bad patch

DISCUSSION Gary Thomas 2 participants 2 messages Jul 12, 2011 – Jul 13, 2011

lore
Share & tools
lore
#0 lore raw

The change applied in the Poky/Yocto tree as f8bf4e2b16f5b36187a966f5bc9121033f038e90 has a shell syntax error. In particular, look at these lines:

@@ -179,8 +185,18 @@ kernel_do_configure() {
cp "${WORKDIR}/defconfig" "${S}/.config"
fi
yes '' | oe_runmake oldconfig
+
+ if [ ! -z "${INITRAMFS_IMAGE}" ]; then
+ for img in cpio.gz cpio.lzo cpio.lzma cpio.xz; do
+ if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img"
+ cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$i
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

This line seems to have been broken (no closing quote, etc)

Signature · 4 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------
#1 lore raw
Quoted 14 lines · Gary Thomas

The change applied in the Poky/Yocto tree as f8bf4e2b16f5b36187a966f5bc9121033f038e90 has a shell syntax error. In particular, look at these lines:

(quoted diff) +5 -0
@@ -179,8 +185,18 @@ kernel_do_configure() {
                 cp "${WORKDIR}/defconfig" "${S}/.config"
         fi
          yes '' | oe_runmake oldconfig
+
+       if [ ! -z "${INITRAMFS_IMAGE}" ]; then
+               for img in cpio.gz cpio.lzo cpio.lzma cpio.xz; do
+               if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img"
+                       cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$i

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Quoted 1 line

This line seems to have been broken (no closing quote, etc)

Thanks, this should be fixed now...

Cheers,

Richard