Fix cp and rm commands in conf and inc files

ghani-1977 · Dec 19, 2020 · 8223522 · 8223522
1 parent 44df0b7
commit 8223522
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/conf/machine/include/dreambox-arm.inc b/conf/machine/include/dreambox-arm.inc
@@ -66,7 +66,7 @@ IMAGE_CMD_tar_prepend = "\
 	rm -Rf ${IMAGE_ROOTFS}/tmp/*; \
 	mkdir -p ${IMAGE_ROOTFS}${localstatedir}/lib/opkg/info; \
 	mkdir -p ${DEPLOY_DIR_IMAGE}/${IMAGEDIR}; \
-	cp ${DEPLOY_DIR_IMAGE}/zImage ${DEPLOY_DIR_IMAGE}/${IMAGEDIR}/${KERNEL_FILE}; \
+	cp -f ${DEPLOY_DIR_IMAGE}/zImage ${DEPLOY_DIR_IMAGE}/${IMAGEDIR}/${KERNEL_FILE}; \
 	echo "${IMAGE_NAME}" > ${DEPLOY_DIR_IMAGE}/${IMAGEDIR}/imageversion; \
 	cd ${IMAGE_ROOTFS}; \
 	tar -cvf ${DEPLOY_DIR_IMAGE}/rootfs.tar -C ${IMAGE_ROOTFS} .; \

diff --git a/recipes-bsp/blindscan/dreambox-blindscan-utils.bb b/recipes-bsp/blindscan/dreambox-blindscan-utils.bb
@@ -36,7 +36,7 @@ SRC_URI[mips32el-krogoth.md5sum] = "185cd9490723728f39953348e322f5c7"
 SRC_URI[mips32el-krogoth.sha256sum] = "0458975ad8325355a5e9514fa4e3505f896298bdad7610718e090b640e3588c5"
 
 do_install() {
-    cp -r * ${D}
+    cp -fr * ${D}
 }
 
 INHIBIT_PACKAGE_STRIP = "1"
diff --git a/recipes-bsp/cfe/dreambox-secondstage.inc b/recipes-bsp/cfe/dreambox-secondstage.inc
@@ -36,7 +36,7 @@ pkg_postinst_${PN}() {
 		if [ -f /tmp/secondstage-${MACHINE}.bin ]; then
 			flash_erase /dev/mtd1 0 0 2>/dev/null
 			nandwrite -m -n -o /dev/mtd1 /tmp/secondstage-${MACHINE}.bin 2>/dev/null
-			rm /tmp/secondstage-${MACHINE}.bin
+			rm -f /tmp/secondstage-${MACHINE}.bin
 		fi
 	fi
 }