Merge pull request beagleboard#21 from SaskatoonTechworks/s_not_b

More S!=B and u-boot packaging changes.
sarnold · Jan 15, 2015 · a936315 · a936315
2 parents c648ddf + bc09f01
commit a936315
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/common-bsp/recipes-bsp/u-boot/u-boot-denx.inc b/common-bsp/recipes-bsp/u-boot/u-boot-denx.inc
@@ -50,9 +50,14 @@ do_compile () {
 
 do_install () {
 	install -d ${D}/boot
-	install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
+	install ${B}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
 	ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
 
+	if [ -e ${B}/MLO ] ; then
+		install ${B}/MLO ${D}/boot/MLO-${MACHINE}-${PV}
+		ln -sf MLO-${MACHINE}-${PV} ${D}/boot/MLO
+	fi
+
 	if [ -e ${WORKDIR}/fw_env.config ] ; then
 		install -d ${D}${sysconfdir}
 		install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
@@ -70,15 +75,15 @@ addtask deploy before do_package after do_compile
 
 do_deploy () {
 	install -d ${DEPLOYDIR}
-	install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
+	install ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
 
 	cd ${DEPLOYDIR}
 	rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK}
 	ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
 	ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
 
-	if [ -e ${S}/MLO ] ; then
-		install ${S}/MLO ${DEPLOYDIR}/MLO-${MACHINE}-${PV}
+	if [ -e ${B}/MLO ] ; then
+		install ${B}/MLO ${DEPLOYDIR}/MLO-${MACHINE}-${PV}
 		rm -f ${DEPLOYDIR}/MLO-${MACHINE} ${DEPLOYDIR}/MLO
 		ln -sf MLO-${MACHINE}-${PV} ${DEPLOYDIR}/MLO-${MACHINE}
 		ln -sf MLO-${MACHINE}-${PV} ${DEPLOYDIR}/MLO

diff --git a/common-bsp/recipes-kernel/linux/linux.inc b/common-bsp/recipes-kernel/linux/linux.inc
@@ -202,8 +202,8 @@ do_install_append() {
 	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}/src/linux-${KERNEL_VERSION} ARCH=$ARCH
 	oe_runmake firmware_install INSTALL_MOD_PATH=${D} ARCH=$ARCH
 	install -d ${D}/boot
-	make dtbs || true
-	install -m 0644 ${S}/arch/arm/boot/dts/*.dtb ${D}/boot || true
+	make -C ${S} O=${B} dtbs || true
+	install -m 0644 ${B}/arch/arm/boot/dts/*.dtb ${D}/boot || true
 
 	install -d ${D}/lib/firmware
 	install -m 0644 ${S}/firmware/capes/*.dts ${D}/lib/firmware || true