packaged-staging.bbclass: removed two few superfluous slashes

${SYSROOT_DESTDIR} ends on a / but there is also a / after the variable
and a slash as the first character of the next variable.
This patch removes the / that is explicitly added so in the generated
code we get // instead of the even sillier looking (and probably more confusing) ///

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 108cfb096b99e8af8ed3346f9389902d9da57b43..1ede25cef02edef208c9bbfa28955ae24aa62388 100644 (file)
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -288,8 +288,8 @@ packagedstaging_fastpath () {
        if [ "$PSTAGING_ACTIVE" = "1" ]; then
                mkdir -p ${PSTAGE_TMPDIR_STAGE}/staging/
                mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/
-               cp -fpPR ${SYSROOT_DESTDIR}/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/staging/ || /bin/true
-               cp -fpPR ${SYSROOT_DESTDIR}/${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/ || /bin/true
+               cp -fpPR ${SYSROOT_DESTDIR}${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/staging/ || /bin/true
+               cp -fpPR ${SYSROOT_DESTDIR}${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/ || /bin/true
        fi
 }
 

diff --git a/recipes/u-boot/u-boot_1.1.4.bb b/recipes/u-boot/u-boot_1.1.4.bb
index df6a357c630b139c2d7f3fd9558f9a31c1d945a1..dacd88655f4c46b26cac8fe1df2e0ede0b09e920 100644 (file)
--- a/recipes/u-boot/u-boot_1.1.4.bb
+++ b/recipes/u-boot/u-boot_1.1.4.bb
@@ -47,6 +47,10 @@ SRC_URI_append_avr32= "\
        file://fix-mmc-data-timeout.patch;patch=1 \
 "
 
+SRC_URI_append_openrd-client = "\
+        file://0001-OpenRD-Support-Uboot.patch;pach=1 \
+"
+
 EXTRA_OEMAKE_gumstix = "CROSS_COMPILE=${TARGET_PREFIX} GUMSTIX_400MHZ=${GUMSTIX_400MHZ}"
 TARGET_LDFLAGS = ""