Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH 0/2] more kernel.bbclass updates
@ 2012-03-29  6:22 Martin Jansa
  2012-03-29  6:24 ` [PATCH 1/2] kernel.bbclass: merge uboot_mkimage improvements from meta-oe Martin Jansa
                   ` (2 more replies)
  0 siblings, 3 replies; 14+ messages in thread
From: Martin Jansa @ 2012-03-29  6:22 UTC (permalink / raw)
  To: openembedded-core

The following changes since commit 432e36300d7231c9b01cd2c6c4b39b84cf4fddca:

  rpm: Ensure we depend on file (2012-03-28 18:40:20 +0100)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib jansa/kernel2
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/kernel2

Martin Jansa (2):
  kernel.bbclass: merge uboot_mkimage improvements from meta-oe
  kernel.bbclass: unify white spaces

 meta/classes/kernel.bbclass |   77 +++++++++++++++++++++++-------------------
 1 files changed, 42 insertions(+), 35 deletions(-)

-- 
1.7.8.5




^ permalink raw reply	[flat|nested] 14+ messages in thread

* [PATCH 1/2] kernel.bbclass: merge uboot_mkimage improvements from meta-oe
  2012-03-29  6:22 [PATCH 0/2] more kernel.bbclass updates Martin Jansa
@ 2012-03-29  6:24 ` Martin Jansa
  2012-03-29 12:54   ` Bruce Ashfield
  2012-03-29 13:11   ` Paul Gortmaker
  2012-03-29  6:24 ` [PATCH 2/2] kernel.bbclass: unify white spaces Martin Jansa
  2012-03-29 14:08 ` [PATCHv2 0/2] more kernel.bbclass updates Martin Jansa
  2 siblings, 2 replies; 14+ messages in thread
From: Martin Jansa @ 2012-03-29  6:24 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/kernel.bbclass |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 3519e7c..8cd5fc7 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -502,32 +502,39 @@ do_sizecheck() {
 
 addtask sizecheck before do_install after do_compile
 
-KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
-# Don't include the DATETIME variable in the sstate package signatures
-KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
-KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
-
-kernel_do_deploy() {
-	install -m 0644 ${KERNEL_OUTPUT} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
-	if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
-		tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
-	fi
-
+do_uboot_mkimage() {
 	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
-		if test -e arch/${ARCH}/boot/uImage ; then
-			cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
-		elif test -e arch/${ARCH}/boot/compressed/vmlinux ; then
+		ENTRYPOINT=${UBOOT_ENTRYPOINT}
+		if test -n "${UBOOT_ENTRYSYMBOL}"; then
+			ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
+				awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
+		fi
+		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 ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
+			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
 			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 ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
+			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
 			rm -f linux.bin.gz
 		fi
 	fi
+}
+
+addtask uboot_mkimage before do_install after do_compile
+
+KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
+# Don't include the DATETIME variable in the sstate package signatures
+KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
+KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
+
+kernel_do_deploy() {
+	install -m 0644 ${KERNEL_OUTPUT} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
+	if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
+		tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
+	fi
 
 	cd ${DEPLOYDIR}
 	rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
-- 
1.7.8.5




^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 2/2] kernel.bbclass: unify white spaces
  2012-03-29  6:22 [PATCH 0/2] more kernel.bbclass updates Martin Jansa
  2012-03-29  6:24 ` [PATCH 1/2] kernel.bbclass: merge uboot_mkimage improvements from meta-oe Martin Jansa
@ 2012-03-29  6:24 ` Martin Jansa
  2012-03-29 10:05   ` Richard Purdie
  2012-03-29 14:08 ` [PATCHv2 0/2] more kernel.bbclass updates Martin Jansa
  2 siblings, 1 reply; 14+ messages in thread
From: Martin Jansa @ 2012-03-29  6:24 UTC (permalink / raw)
  To: openembedded-core

* indentation was with spaces and tabs, unify to use tabs instead of
  spaces, because "python populate_packages" expects tabs (or 8 spaces)
  and we're doing populate_packages_preppend here

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/kernel.bbclass |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 8cd5fc7..f1494b1 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -11,15 +11,15 @@ INITRAMFS_IMAGE ?= ""
 INITRAMFS_TASK ?= ""
 
 python __anonymous () {
-    kerneltype = d.getVar('KERNEL_IMAGETYPE', True) or ''
-    if kerneltype == 'uImage':
-    	depends = d.getVar("DEPENDS", True)
-    	depends = "%s u-boot-mkimage-native" % depends
-    	d.setVar("DEPENDS", depends)
-
-    image = d.getVar('INITRAMFS_IMAGE', True)
-    if image:
-        d.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs')
+	kerneltype = d.getVar('KERNEL_IMAGETYPE', True) or ''
+	if kerneltype == 'uImage':
+		depends = d.getVar("DEPENDS", True)
+		depends = "%s u-boot-mkimage-native" % depends
+		d.setVar("DEPENDS", depends)
+
+	image = d.getVar('INITRAMFS_IMAGE', True)
+	if image:
+		d.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs')
 }
 
 inherit kernel-arch deploy
@@ -91,7 +91,7 @@ kernel_do_compile() {
 do_compile_kernelmodules() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
 	if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
-		oe_runmake ${PARALLEL_MAKE} modules  CC="${KERNEL_CC}" LD="${KERNEL_LD}"
+		oe_runmake ${PARALLEL_MAKE} modules CC="${KERNEL_CC}" LD="${KERNEL_LD}"
 	else
 		bbnote "no modules to compile"
 	fi
@@ -115,7 +115,7 @@ kernel_do_install() {
 
 	#
 	# Install various kernel output (zImage, map file, config, module support files)
-	#	
+	#
 	install -d ${D}/${KERNEL_IMAGEDEST}
 	install -d ${D}/boot
 	install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
@@ -188,7 +188,7 @@ kernel_do_install() {
 	bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
 	           arch/powerpc/boot/mktree"
 	for entry in $bin_files; do
-	        rm -f $kerneldir/$entry
+		rm -f $kerneldir/$entry
 	done
 }
 
@@ -386,10 +386,10 @@ python populate_packages_prepend () {
 		return deps
 	
 	def get_dependencies(file, pattern, format):
-                # file no longer includes PKGD
+		# file no longer includes PKGD
 		file = file.replace(d.getVar('PKGD', True) or '', '', 1)
-                # instead is prefixed with /lib/modules/${KERNEL_VERSION}
-                file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1)
+		# instead is prefixed with /lib/modules/${KERNEL_VERSION}
+		file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1)
 
 		if module_deps.has_key(file):
 			import re
@@ -493,11 +493,11 @@ python populate_packages_prepend () {
 do_sizecheck() {
 	if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
 		size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'`
-        	if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
+		if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
 			rm ${KERNEL_OUTPUT}
-                	die  "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular."
-        	fi
-    	fi
+			die "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular."
+		fi
+	fi
 }
 
 addtask sizecheck before do_install after do_compile
-- 
1.7.8.5




^ permalink raw reply related	[flat|nested] 14+ messages in thread

* Re: [PATCH 2/2] kernel.bbclass: unify white spaces
  2012-03-29  6:24 ` [PATCH 2/2] kernel.bbclass: unify white spaces Martin Jansa
@ 2012-03-29 10:05   ` Richard Purdie
  2012-03-29 12:16     ` Martin Jansa
  0 siblings, 1 reply; 14+ messages in thread
From: Richard Purdie @ 2012-03-29 10:05 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On Thu, 2012-03-29 at 08:24 +0200, Martin Jansa wrote:
> * indentation was with spaces and tabs, unify to use tabs instead of
>   spaces, because "python populate_packages" expects tabs (or 8 spaces)
>   and we're doing populate_packages_preppend here
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/classes/kernel.bbclass |   38 +++++++++++++++++++-------------------
>  1 files changed, 19 insertions(+), 19 deletions(-)

FWIW, we're supposed to be using tabs for shell code and spaces (4) for
python. Unfortunately populate_package() is special due to the number of
places we append/prepend it and the need to be consistent with
whitespace.

I'm therefore not sure it makes sense to re-indent the anonymous python.

Cheers,

Richard




^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 2/2] kernel.bbclass: unify white spaces
  2012-03-29 10:05   ` Richard Purdie
@ 2012-03-29 12:16     ` Martin Jansa
  2012-03-29 13:02       ` Richard Purdie
  0 siblings, 1 reply; 14+ messages in thread
From: Martin Jansa @ 2012-03-29 12:16 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

[-- Attachment #1: Type: text/plain, Size: 1024 bytes --]

On Thu, Mar 29, 2012 at 11:05:47AM +0100, Richard Purdie wrote:
> On Thu, 2012-03-29 at 08:24 +0200, Martin Jansa wrote:
> > * indentation was with spaces and tabs, unify to use tabs instead of
> >   spaces, because "python populate_packages" expects tabs (or 8 spaces)
> >   and we're doing populate_packages_preppend here
> > 
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  meta/classes/kernel.bbclass |   38 +++++++++++++++++++-------------------
> >  1 files changed, 19 insertions(+), 19 deletions(-)
> 
> FWIW, we're supposed to be using tabs for shell code and spaces (4) for
> python. Unfortunately populate_package() is special due to the number of
> places we append/prepend it and the need to be consistent with
> whitespace.
> 
> I'm therefore not sure it makes sense to re-indent the anonymous python.

Agreed, but that anonymous python used spaces and tabs in the same
function which is ugly.

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 1/2] kernel.bbclass: merge uboot_mkimage improvements from meta-oe
  2012-03-29  6:24 ` [PATCH 1/2] kernel.bbclass: merge uboot_mkimage improvements from meta-oe Martin Jansa
@ 2012-03-29 12:54   ` Bruce Ashfield
  2012-03-29 13:11   ` Paul Gortmaker
  1 sibling, 0 replies; 14+ messages in thread
From: Bruce Ashfield @ 2012-03-29 12:54 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On Thu, Mar 29, 2012 at 2:24 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/classes/kernel.bbclass |   39 +++++++++++++++++++++++----------------
>  1 files changed, 23 insertions(+), 16 deletions(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 3519e7c..8cd5fc7 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -502,32 +502,39 @@ do_sizecheck() {
>
>  addtask sizecheck before do_install after do_compile
>
> -KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
> -# Don't include the DATETIME variable in the sstate package signatures
> -KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
> -KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
> -
> -kernel_do_deploy() {
> -       install -m 0644 ${KERNEL_OUTPUT} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
> -       if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
> -               tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
> -       fi
> -
> +do_uboot_mkimage() {
>        if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
> -               if test -e arch/${ARCH}/boot/uImage ; then
> -                       cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin

We continually try and remove this, but it is a valid use case where some
people do want the kernel's uImage to be used and not regenerate it outside
of the kernel build process.

The last time this was discussed, it concluded that rather than making this
a simple test, we should do it via a flag .. and I'm still of the
opinion that would
be the right approach here. There's no reason to break either use case.

Cheers,

Bruce

> -               elif test -e arch/${ARCH}/boot/compressed/vmlinux ; then
> +               ENTRYPOINT=${UBOOT_ENTRYPOINT}
> +               if test -n "${UBOOT_ENTRYSYMBOL}"; then
> +                       ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
> +                               awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
> +               fi
> +               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 ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
> +                       uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
>                        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 ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
> +                       uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
>                        rm -f linux.bin.gz
>                fi
>        fi
> +}
> +
> +addtask uboot_mkimage before do_install after do_compile
> +
> +KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
> +# Don't include the DATETIME variable in the sstate package signatures
> +KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
> +KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
> +
> +kernel_do_deploy() {
> +       install -m 0644 ${KERNEL_OUTPUT} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
> +       if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
> +               tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
> +       fi
>
>        cd ${DEPLOYDIR}
>        rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
> --
> 1.7.8.5
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"



^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 2/2] kernel.bbclass: unify white spaces
  2012-03-29 12:16     ` Martin Jansa
@ 2012-03-29 13:02       ` Richard Purdie
  0 siblings, 0 replies; 14+ messages in thread
From: Richard Purdie @ 2012-03-29 13:02 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On Thu, 2012-03-29 at 14:16 +0200, Martin Jansa wrote:
> On Thu, Mar 29, 2012 at 11:05:47AM +0100, Richard Purdie wrote:
> > On Thu, 2012-03-29 at 08:24 +0200, Martin Jansa wrote:
> > > * indentation was with spaces and tabs, unify to use tabs instead of
> > >   spaces, because "python populate_packages" expects tabs (or 8 spaces)
> > >   and we're doing populate_packages_preppend here
> > > 
> > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > > ---
> > >  meta/classes/kernel.bbclass |   38 +++++++++++++++++++-------------------
> > >  1 files changed, 19 insertions(+), 19 deletions(-)
> > 
> > FWIW, we're supposed to be using tabs for shell code and spaces (4) for
> > python. Unfortunately populate_package() is special due to the number of
> > places we append/prepend it and the need to be consistent with
> > whitespace.
> > 
> > I'm therefore not sure it makes sense to re-indent the anonymous python.
> 
> Agreed, but that anonymous python used spaces and tabs in the same
> function which is ugly.

I'm fine with cleaning that up but lets continue to use tabs for shell
and spaces for python where at all possible, then we're consistent :)

Cheers,

Richard




^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 1/2] kernel.bbclass: merge uboot_mkimage improvements from meta-oe
  2012-03-29  6:24 ` [PATCH 1/2] kernel.bbclass: merge uboot_mkimage improvements from meta-oe Martin Jansa
  2012-03-29 12:54   ` Bruce Ashfield
@ 2012-03-29 13:11   ` Paul Gortmaker
  1 sibling, 0 replies; 14+ messages in thread
From: Paul Gortmaker @ 2012-03-29 13:11 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa

On 12-03-29 02:24 AM, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

A commit log here would have been nice. Since it isn't apparently
clear what the improvements are to myself or others.

I especially don't understand these cases where people start manually
running mkimage vs. taking the uImage from the kernel build. If there
is magic address foo needed to make a useful uImage for the platform,
then why isn't this data in the kernel Makefiles, vs. being squirrelled
off in some recipe? At a minimum, some comments in the recipe indicating
what the need for the custom mkimage call was about, and why it differed
from the default kernel uImage would be good.

Thanks,
Paul.


> ---
>  meta/classes/kernel.bbclass |   39 +++++++++++++++++++++++----------------
>  1 files changed, 23 insertions(+), 16 deletions(-)
> 
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 3519e7c..8cd5fc7 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -502,32 +502,39 @@ do_sizecheck() {
>  
>  addtask sizecheck before do_install after do_compile
>  
> -KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
> -# Don't include the DATETIME variable in the sstate package signatures
> -KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
> -KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
> -
> -kernel_do_deploy() {
> -	install -m 0644 ${KERNEL_OUTPUT} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
> -	if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
> -		tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
> -	fi
> -
> +do_uboot_mkimage() {
>  	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
> -		if test -e arch/${ARCH}/boot/uImage ; then
> -			cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
> -		elif test -e arch/${ARCH}/boot/compressed/vmlinux ; then
> +		ENTRYPOINT=${UBOOT_ENTRYPOINT}
> +		if test -n "${UBOOT_ENTRYSYMBOL}"; then
> +			ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
> +				awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
> +		fi
> +		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 ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
> +			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
>  			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 ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
> +			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
>  			rm -f linux.bin.gz
>  		fi
>  	fi
> +}
> +
> +addtask uboot_mkimage before do_install after do_compile
> +
> +KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
> +# Don't include the DATETIME variable in the sstate package signatures
> +KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
> +KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
> +
> +kernel_do_deploy() {
> +	install -m 0644 ${KERNEL_OUTPUT} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
> +	if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
> +		tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
> +	fi
>  
>  	cd ${DEPLOYDIR}
>  	rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin



^ permalink raw reply	[flat|nested] 14+ messages in thread

* [PATCHv2 0/2] more kernel.bbclass updates
  2012-03-29  6:22 [PATCH 0/2] more kernel.bbclass updates Martin Jansa
  2012-03-29  6:24 ` [PATCH 1/2] kernel.bbclass: merge uboot_mkimage improvements from meta-oe Martin Jansa
  2012-03-29  6:24 ` [PATCH 2/2] kernel.bbclass: unify white spaces Martin Jansa
@ 2012-03-29 14:08 ` Martin Jansa
  2012-03-29 14:08   ` [PATCHv2 1/2] kernel.bbclass: merge uboot_mkimage improvements from meta-oe Martin Jansa
                     ` (3 more replies)
  2 siblings, 4 replies; 14+ messages in thread
From: Martin Jansa @ 2012-03-29 14:08 UTC (permalink / raw)
  To: openembedded-core

The following changes since commit 432e36300d7231c9b01cd2c6c4b39b84cf4fddca:

  rpm: Ensure we depend on file (2012-03-28 18:40:20 +0100)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib jansa/kernel2
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/kernel2

Martin Jansa (2):
  kernel.bbclass: merge uboot_mkimage improvements from meta-oe
  kernel.bbclass: unify white spaces

 meta/classes/kernel.bbclass |   67 ++++++++++++++++++++++++------------------
 1 files changed, 38 insertions(+), 29 deletions(-)

-- 
1.7.8.5




^ permalink raw reply	[flat|nested] 14+ messages in thread

* [PATCHv2 1/2] kernel.bbclass: merge uboot_mkimage improvements from meta-oe
  2012-03-29 14:08 ` [PATCHv2 0/2] more kernel.bbclass updates Martin Jansa
@ 2012-03-29 14:08   ` Martin Jansa
  2012-03-29 14:15     ` Bruce Ashfield
  2012-03-29 14:08   ` [PATCHv2 2/2] kernel.bbclass: unify white spaces Martin Jansa
                     ` (2 subsequent siblings)
  3 siblings, 1 reply; 14+ messages in thread
From: Martin Jansa @ 2012-03-29 14:08 UTC (permalink / raw)
  To: openembedded-core

* allows to detect ENTRYPOINT from kernel binary marked with UBOOT_ENTRYSYMBOL
  used e.g. by ben-nanonote

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/kernel.bbclass |   41 +++++++++++++++++++++++++----------------
 1 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 3519e7c..0ae9bed 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -507,28 +507,37 @@ KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME
 KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
 KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
 
+do_uboot_mkimage() {
+	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
+		if test ! -e arch/${ARCH}/boot/uImage ; then
+			ENTRYPOINT=${UBOOT_ENTRYPOINT}
+			if test -n "${UBOOT_ENTRYSYMBOL}"; then
+				ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
+					awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
+			fi
+			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 $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
+				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 $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
+				rm -f linux.bin.gz
+			fi
+		fi
+	fi
+}
+
+addtask uboot_mkimage before do_install after do_compile
+
 kernel_do_deploy() {
 	install -m 0644 ${KERNEL_OUTPUT} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
 	if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
 		tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
 	fi
 
-	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
-		if test -e arch/${ARCH}/boot/uImage ; then
-			cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
-		elif 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 ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/${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 ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
-			rm -f linux.bin.gz
-		fi
-	fi
-
 	cd ${DEPLOYDIR}
 	rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
 	ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
-- 
1.7.8.5




^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCHv2 2/2] kernel.bbclass: unify white spaces
  2012-03-29 14:08 ` [PATCHv2 0/2] more kernel.bbclass updates Martin Jansa
  2012-03-29 14:08   ` [PATCHv2 1/2] kernel.bbclass: merge uboot_mkimage improvements from meta-oe Martin Jansa
@ 2012-03-29 14:08   ` Martin Jansa
  2012-04-24 15:03   ` [PATCHv2 0/2] more kernel.bbclass updates Martin Jansa
  2012-04-27 21:07   ` Saul Wold
  3 siblings, 0 replies; 14+ messages in thread
From: Martin Jansa @ 2012-03-29 14:08 UTC (permalink / raw)
  To: openembedded-core

* indentation was with spaces and tabs, unify to use tabs instead of
  spaces, for shell code and populate_packages_preppend,
  because "python populate_packages" expects tabs (or 8 spaces)
* and use 4 spaces for anonymous python

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/kernel.bbclass |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 0ae9bed..cf060c6 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -13,9 +13,9 @@ INITRAMFS_TASK ?= ""
 python __anonymous () {
     kerneltype = d.getVar('KERNEL_IMAGETYPE', True) or ''
     if kerneltype == 'uImage':
-    	depends = d.getVar("DEPENDS", True)
-    	depends = "%s u-boot-mkimage-native" % depends
-    	d.setVar("DEPENDS", depends)
+        depends = d.getVar("DEPENDS", True)
+        depends = "%s u-boot-mkimage-native" % depends
+        d.setVar("DEPENDS", depends)
 
     image = d.getVar('INITRAMFS_IMAGE', True)
     if image:
@@ -91,7 +91,7 @@ kernel_do_compile() {
 do_compile_kernelmodules() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
 	if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
-		oe_runmake ${PARALLEL_MAKE} modules  CC="${KERNEL_CC}" LD="${KERNEL_LD}"
+		oe_runmake ${PARALLEL_MAKE} modules CC="${KERNEL_CC}" LD="${KERNEL_LD}"
 	else
 		bbnote "no modules to compile"
 	fi
@@ -115,7 +115,7 @@ kernel_do_install() {
 
 	#
 	# Install various kernel output (zImage, map file, config, module support files)
-	#	
+	#
 	install -d ${D}/${KERNEL_IMAGEDEST}
 	install -d ${D}/boot
 	install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
@@ -188,7 +188,7 @@ kernel_do_install() {
 	bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
 	           arch/powerpc/boot/mktree"
 	for entry in $bin_files; do
-	        rm -f $kerneldir/$entry
+		rm -f $kerneldir/$entry
 	done
 }
 
@@ -386,10 +386,10 @@ python populate_packages_prepend () {
 		return deps
 	
 	def get_dependencies(file, pattern, format):
-                # file no longer includes PKGD
+		# file no longer includes PKGD
 		file = file.replace(d.getVar('PKGD', True) or '', '', 1)
-                # instead is prefixed with /lib/modules/${KERNEL_VERSION}
-                file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1)
+		# instead is prefixed with /lib/modules/${KERNEL_VERSION}
+		file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1)
 
 		if module_deps.has_key(file):
 			import re
@@ -493,11 +493,11 @@ python populate_packages_prepend () {
 do_sizecheck() {
 	if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
 		size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'`
-        	if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
+		if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
 			rm ${KERNEL_OUTPUT}
-                	die  "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular."
-        	fi
-    	fi
+			die "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular."
+		fi
+	fi
 }
 
 addtask sizecheck before do_install after do_compile
-- 
1.7.8.5




^ permalink raw reply related	[flat|nested] 14+ messages in thread

* Re: [PATCHv2 1/2] kernel.bbclass: merge uboot_mkimage improvements from meta-oe
  2012-03-29 14:08   ` [PATCHv2 1/2] kernel.bbclass: merge uboot_mkimage improvements from meta-oe Martin Jansa
@ 2012-03-29 14:15     ` Bruce Ashfield
  0 siblings, 0 replies; 14+ messages in thread
From: Bruce Ashfield @ 2012-03-29 14:15 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa

On 12-03-29 10:08 AM, Martin Jansa wrote:
> * allows to detect ENTRYPOINT from kernel binary marked with UBOOT_ENTRYSYMBOL
>    used e.g. by ben-nanonote

Nice to see the big benefit called out, definitely helps the
casual reader :)

Looks like we've got all the use cases preserved, so I have no objections.

Acked-by: Bruce Ashfield <bruce.ashfield@windriver.com>

Cheers,

Bruce

>
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> ---
>   meta/classes/kernel.bbclass |   41 +++++++++++++++++++++++++----------------
>   1 files changed, 25 insertions(+), 16 deletions(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 3519e7c..0ae9bed 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -507,28 +507,37 @@ KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME
>   KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
>   KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
>
> +do_uboot_mkimage() {
> +	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
> +		if test ! -e arch/${ARCH}/boot/uImage ; then
> +			ENTRYPOINT=${UBOOT_ENTRYPOINT}
> +			if test -n "${UBOOT_ENTRYSYMBOL}"; then
> +				ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
> +					awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
> +			fi
> +			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 $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
> +				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 $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
> +				rm -f linux.bin.gz
> +			fi
> +		fi
> +	fi
> +}
> +
> +addtask uboot_mkimage before do_install after do_compile
> +
>   kernel_do_deploy() {
>   	install -m 0644 ${KERNEL_OUTPUT} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
>   	if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
>   		tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
>   	fi
>
> -	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
> -		if test -e arch/${ARCH}/boot/uImage ; then
> -			cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
> -		elif 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 ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/${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 ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
> -			rm -f linux.bin.gz
> -		fi
> -	fi
> -
>   	cd ${DEPLOYDIR}
>   	rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
>   	ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin




^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCHv2 0/2] more kernel.bbclass updates
  2012-03-29 14:08 ` [PATCHv2 0/2] more kernel.bbclass updates Martin Jansa
  2012-03-29 14:08   ` [PATCHv2 1/2] kernel.bbclass: merge uboot_mkimage improvements from meta-oe Martin Jansa
  2012-03-29 14:08   ` [PATCHv2 2/2] kernel.bbclass: unify white spaces Martin Jansa
@ 2012-04-24 15:03   ` Martin Jansa
  2012-04-27 21:07   ` Saul Wold
  3 siblings, 0 replies; 14+ messages in thread
From: Martin Jansa @ 2012-04-24 15:03 UTC (permalink / raw)
  To: openembedded-core

[-- Attachment #1: Type: text/plain, Size: 786 bytes --]

On Thu, Mar 29, 2012 at 04:08:43PM +0200, Martin Jansa wrote:
> The following changes since commit 432e36300d7231c9b01cd2c6c4b39b84cf4fddca:
> 
>   rpm: Ensure we depend on file (2012-03-28 18:40:20 +0100)
> 
> are available in the git repository at:
>   git://git.openembedded.org/openembedded-core-contrib jansa/kernel2
>   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/kernel2
> 
> Martin Jansa (2):
>   kernel.bbclass: merge uboot_mkimage improvements from meta-oe
>   kernel.bbclass: unify white spaces
> 
>  meta/classes/kernel.bbclass |   67 ++++++++++++++++++++++++------------------
>  1 files changed, 38 insertions(+), 29 deletions(-)

Can this go to master-next?

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCHv2 0/2] more kernel.bbclass updates
  2012-03-29 14:08 ` [PATCHv2 0/2] more kernel.bbclass updates Martin Jansa
                     ` (2 preceding siblings ...)
  2012-04-24 15:03   ` [PATCHv2 0/2] more kernel.bbclass updates Martin Jansa
@ 2012-04-27 21:07   ` Saul Wold
  3 siblings, 0 replies; 14+ messages in thread
From: Saul Wold @ 2012-04-27 21:07 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa

On 03/29/2012 07:08 AM, Martin Jansa wrote:
> The following changes since commit 432e36300d7231c9b01cd2c6c4b39b84cf4fddca:
>
>    rpm: Ensure we depend on file (2012-03-28 18:40:20 +0100)
>
> are available in the git repository at:
>    git://git.openembedded.org/openembedded-core-contrib jansa/kernel2
>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/kernel2
>
> Martin Jansa (2):
>    kernel.bbclass: merge uboot_mkimage improvements from meta-oe
>    kernel.bbclass: unify white spaces
>
>   meta/classes/kernel.bbclass |   67 ++++++++++++++++++++++++------------------
>   1 files changed, 38 insertions(+), 29 deletions(-)
>

Merged into OE-Core

Thanks
	Sau!



^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2012-04-27 21:17 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-29  6:22 [PATCH 0/2] more kernel.bbclass updates Martin Jansa
2012-03-29  6:24 ` [PATCH 1/2] kernel.bbclass: merge uboot_mkimage improvements from meta-oe Martin Jansa
2012-03-29 12:54   ` Bruce Ashfield
2012-03-29 13:11   ` Paul Gortmaker
2012-03-29  6:24 ` [PATCH 2/2] kernel.bbclass: unify white spaces Martin Jansa
2012-03-29 10:05   ` Richard Purdie
2012-03-29 12:16     ` Martin Jansa
2012-03-29 13:02       ` Richard Purdie
2012-03-29 14:08 ` [PATCHv2 0/2] more kernel.bbclass updates Martin Jansa
2012-03-29 14:08   ` [PATCHv2 1/2] kernel.bbclass: merge uboot_mkimage improvements from meta-oe Martin Jansa
2012-03-29 14:15     ` Bruce Ashfield
2012-03-29 14:08   ` [PATCHv2 2/2] kernel.bbclass: unify white spaces Martin Jansa
2012-04-24 15:03   ` [PATCHv2 0/2] more kernel.bbclass updates Martin Jansa
2012-04-27 21:07   ` Saul Wold

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox