[oe-commits] org.oe.dev merge of '54d41b90eb39f940315cabcc3f06e21d097472a9'

[oe commit]

merge of '54d41b90eb39f940315cabcc3f06e21d097472a9'
     and '81fc7ef21372b525a566c7050bd637f8bff9c6b7'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 9698a2d90f7c7d5c2f153b730e5ddcc1e9b05395
ViewMTN: http://monotone.openembedded.org/revision/info/9698a2d90f7c7d5c2f153b730e5ddcc1e9b05395
Files:
1
packages/abiword/abiword-plugins_2.5.1.bb
packages/abiword/abiword-plugins_2.5.2.bb
classes/kernel.bbclass
packages/linux/linux.inc
Diffs:

#
# mt diff -r54d41b90eb39f940315cabcc3f06e21d097472a9 -r9698a2d90f7c7d5c2f153b730e5ddcc1e9b05395
#
#
#
# patch "packages/abiword/abiword-plugins_2.5.1.bb"
#  from [62e4936aba824f0155caa54f5911ce2750c5a7ae]
#    to [80bb349de2e542daecc78e094218894b5f117405]
# 
# patch "packages/abiword/abiword-plugins_2.5.2.bb"
#  from [b02d055a699a18d721d373c5bcbe26e5d8a5f882]
#    to [156bd16e63ca8fba3be27dade721ca7936fbd5cf]
#
============================================================
--- packages/abiword/abiword-plugins_2.5.1.bb	62e4936aba824f0155caa54f5911ce2750c5a7ae
+++ packages/abiword/abiword-plugins_2.5.1.bb	80bb349de2e542daecc78e094218894b5f117405
@@ -1,4 +1,4 @@
-DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word""
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
 HOMEPAGE = "http://www.abiword.org"
 SECTION = "x11/office"
 LICENSE = "GPLv2"
============================================================
--- packages/abiword/abiword-plugins_2.5.2.bb	b02d055a699a18d721d373c5bcbe26e5d8a5f882
+++ packages/abiword/abiword-plugins_2.5.2.bb	156bd16e63ca8fba3be27dade721ca7936fbd5cf
@@ -1,4 +1,4 @@
-DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word""
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
 HOMEPAGE = "http://www.abiword.org"
 SECTION = "x11/office"
 LICENSE = "GPLv2"


#
# mt diff -r81fc7ef21372b525a566c7050bd637f8bff9c6b7 -r9698a2d90f7c7d5c2f153b730e5ddcc1e9b05395
#
#
#
# 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}"