[oe-commits] org.oe.dev merge of '048d7a25deec409ecdb2a1dacf3ef6afb4f6359f'

[oe commit]

merge of '048d7a25deec409ecdb2a1dacf3ef6afb4f6359f'
     and 'f38f68f6196f02a72030cf539729f671d94c6542'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 54d41b90eb39f940315cabcc3f06e21d097472a9
ViewMTN: http://monotone.openembedded.org/revision/info/54d41b90eb39f940315cabcc3f06e21d097472a9
Files:
1
classes/kernel.bbclass
packages/linux/linux.inc
packages/abiword/abiword_2.6.0.bb
Diffs:

#
# mt diff -r048d7a25deec409ecdb2a1dacf3ef6afb4f6359f -r54d41b90eb39f940315cabcc3f06e21d097472a9
#
#
#
# patch "classes/kernel.bbclass"
#  from [56eee918e2285b8298e9e2feecc353c0723683aa]
#    to [a2023556ff7f2b754b62219b795ef6bf47185281]
# 
# patch "packages/linux/linux.inc"
#  from [0196432d82c97552c01b010a212e24c2a8b0016a]
#    to [b47745bb07740dbcd2a179fcdac54a843d0dbf35]
#
============================================================
--- classes/kernel.bbclass	56eee918e2285b8298e9e2feecc353c0723683aa
+++ classes/kernel.bbclass	a2023556ff7f2b754b62219b795ef6bf47185281
@@ -463,8 +463,8 @@ addtask sizecheck before do_install afte
 
 addtask sizecheck before do_install after do_compile
 
-KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
-KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"
+KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}"
+KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
 
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
@@ -475,22 +475,22 @@ do_deploy() {
 	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
 		if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
 			${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
-			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
 			rm -f linux.bin
 		else
 			${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
 			rm -f linux.bin.gz
 			gzip -9 linux.bin
-			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
 			rm -f linux.bin.gz
 		fi
-		package_stagefile_shell ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+		package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
 	fi
 
 	cd ${DEPLOY_DIR_IMAGE}
 	rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
 	ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
-        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_SYMLINK_NAME}.bin
+	package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_SYMLINK_NAME}.bin
 }
 
 do_deploy[dirs] = "${S}"
============================================================
--- packages/linux/linux.inc	0196432d82c97552c01b010a212e24c2a8b0016a
+++ packages/linux/linux.inc	b47745bb07740dbcd2a179fcdac54a843d0dbf35
@@ -106,5 +106,3 @@ do_compile_append() {
     fi
 }
 
-KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}"
-KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"


#
# mt diff -rf38f68f6196f02a72030cf539729f671d94c6542 -r54d41b90eb39f940315cabcc3f06e21d097472a9
#
#
#
# add_file "packages/abiword/abiword_2.6.0.bb"
#  content [e1a10b5275d12dca63a83d0c19b8277c9cd110ea]
#
============================================================
--- packages/abiword/abiword_2.6.0.bb	e1a10b5275d12dca63a83d0c19b8277c9cd110ea
+++ packages/abiword/abiword_2.6.0.bb	e1a10b5275d12dca63a83d0c19b8277c9cd110ea
@@ -0,0 +1,3 @@
+require abiword-2.5.inc
+
+RCONFLICTS = "abiword-embedded"