[PATCH 0/8] Pending patches from O.S. Systems tree

STALE5534d SUPERSEDED

Revision v1 of 7 in this series.

20 messages, 5 authors, 2011-08-24 · open the first message on its own page

[PATCH 0/8] Pending patches from O.S. Systems tree

From: Otavio Salvador <hidden>
Date: 2011-08-20 05:03:42

The following changes since commit c539155c51e43680711130df9050d3e92282591e:

  newt: update distro tracking fields (2011-08-19 09:05:54 -0700)

are available in the git repository at:
  git://github.com/OSSystems/oe-core master
  https://github.com/OSSystems/oe-core/tree/master

Otavio Salvador (8):
  Use OECORE_DISTRO_VERSION instead of POKY_DISTRO_VERSION
  kernel.bbclass: blacklist perf-dbg
  kernel.bbclass: move uboot image generation to a specific class
  kernel.bbclass: save kernel image name into $kerneldir
  fix SDK building due TARGET_ARCH use in installation path
  scripts/runqemu: add support to pass bootparams to kernel
  scripts/runqemu: remove redundant checking
  scripts/combo-layer: fix configuration file handling

 meta/classes/kernel.bbclass            |   47 ++++++++++++++++++++-----------
 meta/classes/populate_sdk.bbclass      |    2 +-
 meta/classes/toolchain-scripts.bbclass |   12 ++++----
 meta/conf/bitbake.conf                 |    2 +-
 scripts/combo-layer                    |    4 +-
 scripts/oe-find-native-sysroot         |    2 +-
 scripts/runqemu                        |    5 +++-
 scripts/runqemu-export-rootfs          |    2 +-
 8 files changed, 46 insertions(+), 30 deletions(-)

-- 
1.7.2.5


[PATCH 2/8] kernel.bbclass: blacklist perf-dbg

From: Otavio Salvador <hidden>
Date: 2011-08-20 05:03:43

Signed-off-by: Otavio Salvador <redacted>
---
 meta/classes/kernel.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index a2b10f2..ff3fa46 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -440,7 +440,7 @@ python populate_packages_prepend () {
 	metapkg = "kernel-modules"
 	bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
 	bb.data.setVar('FILES_' + metapkg, "", d)
-	blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf', 'kernel-misc' ]
+	blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf', 'perf-dbg', 'kernel-misc' ]
 	for l in module_deps.values():
 		for i in l:
 			pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1))
-- 
1.7.2.5


[PATCH 1/8] Use OECORE_DISTRO_VERSION instead of POKY_DISTRO_VERSION

From: Otavio Salvador <hidden>
Date: 2011-08-20 05:03:44

Signed-off-by: Otavio Salvador <redacted>
---
 meta/classes/toolchain-scripts.bbclass |   12 ++++++------
 scripts/oe-find-native-sysroot         |    2 +-
 scripts/runqemu-export-rootfs          |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index f7b52be..b7e4e04 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -29,8 +29,8 @@ toolchain_create_sdk_env_script () {
 	echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
 	echo 'export OECORE_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script
 	echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/aclocal"' >> $script
-	echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
-	echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script
+	echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
+	echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
 }
 
 # This function creates an environment-setup-script in the TMPDIR which enables
@@ -63,8 +63,8 @@ toolchain_create_tree_env_script () {
 	echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script
 	echo 'export OECORE_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script
 	echo 'export OECORE_ACLOCAL_OPTS="-I ${STAGING_DIR_NATIVE}/usr/share/aclocal"' >> $script
-	echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
-	echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script
+	echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
+	echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
 }
 
 # This function creates an environment-setup-script for use by the ADT installer
@@ -97,8 +97,8 @@ toolchain_create_sdk_env_script_for_installer () {
 	echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
 	echo 'export OECORE_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
         echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/acloal"' >> $script
-	echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
-	echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script
+	echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
+	echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
 }
 
 #This function create a site config file
diff --git a/scripts/oe-find-native-sysroot b/scripts/oe-find-native-sysroot
index 26fc730..b99014b 100755
--- a/scripts/oe-find-native-sysroot
+++ b/scripts/oe-find-native-sysroot
@@ -59,7 +59,7 @@ fi
 if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/pseudo" ]; then
     echo "Error: Unable to find pseudo binary in $OECORE_NATIVE_SYSROOT/usr/bin/"
 
-    if [ "x$POKY_DISTRO_VERSION" = "x" ]; then
+    if [ "x$OECORE_DISTRO_VERSION" = "x" ]; then
         echo "Have you run 'bitbake meta-ide-support'?"
     else
         echo "This shouldn't happen - something is wrong with your toolchain installation"
diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootfs
index 6b4aee8..6f4604d 100755
--- a/scripts/runqemu-export-rootfs
+++ b/scripts/runqemu-export-rootfs
@@ -49,7 +49,7 @@ fi
 if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/sbin/rpc.mountd" ]; then
 	echo "Error: Unable to find rpc.mountd binary in $OECORE_NATIVE_SYSROOT/usr/sbin/"
 
-	if [ "x$POKY_DISTRO_VERSION" = "x" ]; then
+	if [ "x$OECORE_DISTRO_VERSION" = "x" ]; then
 	    echo "Have you run 'bitbake meta-ide-support'?"
 	else
 	    echo "This shouldn't happen - something is missing from your toolchain installation"
-- 
1.7.2.5


[PATCH 3/8] kernel.bbclass: move uboot image generation to a specific class

From: Otavio Salvador <hidden>
Date: 2011-08-20 05:03:45

Signed-off-by: Otavio Salvador <redacted>
---
 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 ff3fa46..8a56b85 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -470,6 +470,29 @@ do_sizecheck() {
 
 addtask sizecheck before do_install after do_compile
 
+do_uboot_mkimage() {
+    if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; 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
+}
+
+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"
@@ -481,22 +504,6 @@ kernel_do_deploy() {
 		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.2.5


[PATCH 5/8] fix SDK building due TARGET_ARCH use in installation path

From: Otavio Salvador <hidden>
Date: 2011-08-20 05:03:49

TARGET_ARCH makes the building too fragile since it changes during
building of target and nativesdk binaries thus making it difficult to
handle a proper path for installation of binaries. The fix for it is
to move it to toolchain tarball name.

Signed-off-by: Otavio Salvador <redacted>
---
 meta/classes/populate_sdk.bbclass |    2 +-
 meta/conf/bitbake.conf            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/populate_sdk.bbclass b/meta/classes/populate_sdk.bbclass
index 0f3591b..929f730 100644
--- a/meta/classes/populate_sdk.bbclass
+++ b/meta/classes/populate_sdk.bbclass
@@ -9,7 +9,7 @@ SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${TARGET_SYS}"
 
 TOOLCHAIN_HOST_TASK ?= "task-sdk-host-nativesdk task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 TOOLCHAIN_TARGET_TASK ?= "task-core-standalone-sdk-target task-core-standalone-sdk-target-dbg"
-TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}"
+TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-${SDK_ARCH}-${TARGET_ARCH}-toolchain-${DISTRO_VERSION}"
 
 RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
 DEPENDS = "virtual/fakeroot-native sed-native"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b309516..b5c6696 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -361,7 +361,7 @@ DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
 
 PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"
 
-SDK_NAME = "oecore-${SDK_ARCH}-${TARGET_ARCH}"
+SDK_NAME = "oecore-sdk-${DISTRO}"
 SDKPATH = "/usr/local/${SDK_NAME}"
 SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}"
 
-- 
1.7.2.5


[PATCH 4/8] kernel.bbclass: save kernel image name into $kerneldir

From: Otavio Salvador <hidden>
Date: 2011-08-20 05:03:49

Save the kernel image name into sysroot so it can be used during image
build if need. This is used by O.S. Systems products and probably
useful to others.

Signed-off-by: Otavio Salvador <redacted>
---
 meta/classes/kernel.bbclass |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 8a56b85..354f1d6 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -129,6 +129,12 @@ kernel_do_install() {
 	echo "${KERNEL_VERSION}" > $kerneldir/kernel-abiversion
 
 	#
+	# Store kernel image name to allow use during image generation
+	#
+
+	echo "${KERNEL_IMAGE_BASE_NAME}" >$kerneldir/kernel-image-name
+
+	#
 	# Copy the entire source tree. In case an external build directory is
 	# used, copy the build directory over first, then copy over the source
 	# dir. This ensures the original Makefiles are used and not the
-- 
1.7.2.5


[PATCH 6/8] scripts/runqemu: add support to pass bootparams to kernel

From: Otavio Salvador <hidden>
Date: 2011-08-20 05:03:56

Signed-off-by: Otavio Salvador <redacted>
---
 scripts/runqemu |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index ed8c05b..91c3c9e 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -135,6 +135,9 @@ while [ $i -le $# ]; do
             SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -serial stdio"
             SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT console=ttyS0"
             ;;
+        "bootparams="*)
+            SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT ${arg##bootparams=}"
+            ;;
         "audio")
             if [[ "x$MACHINE" == "xqemux86" || "x$MACHINE" == "xqemux86-64" ]]; then
                 echo "Enable audio on qemu. Pls. install snd_intel8x0 or snd_ens1370 driver in linux guest.";
-- 
1.7.2.5


[PATCH 7/8] scripts/runqemu: remove redundant checking

From: Otavio Salvador <hidden>
Date: 2011-08-20 05:03:57

Signed-off-by: Otavio Salvador <redacted>
---
 scripts/runqemu |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index 91c3c9e..d617f79 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -163,7 +163,7 @@ while [ $i -le $# ]; do
             # A directory name is an nfs rootfs
             if [ -d "$arg" ]; then
                 echo "Assuming $arg is an nfs rootfs"
-                if [[ -z "$FSTYPE" || "$FSTYPE" == "nfs" ]]; then
+                if [[ -z "$FSTYPE" ]]; then
                     FSTYPE=nfs
                 else
                     echo "Error: conflicting FSTYPE types [$arg] and nfs"
-- 
1.7.2.5


[PATCH 8/8] scripts/combo-layer: fix configuration file handling

From: Otavio Salvador <hidden>
Date: 2011-08-20 05:03:58

Signed-off-by: Otavio Salvador <redacted>
---
 scripts/combo-layer |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 07b3382..f8763ee 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -339,8 +339,8 @@ Action:
   update            get patches from component repos and apply them to the combo repo
   splitpatch [commit] generate commit patch and split per component, default commit is HEAD""")
 
-    parser.add_option("-c", "--conf", help = "specify the config file. default is conf/combolayer.conf",
-               action = "store", dest = "conffile", default = "combo-layer.conf")
+    parser.add_option("-c", "--conf", help = "specify the config file (conf/combo-layer.conf is the default).",
+               action = "store", dest = "conffile", default = "conf/combo-layer.conf")
 
     parser.add_option("-i", "--interactive", help = "interactive mode, user can edit the patch list and patches",
                action = "store_true", dest = "interactive", default = False)
-- 
1.7.2.5


Re: [PATCH 3/8] kernel.bbclass: move uboot image generation to a specific class

From: Bruce Ashfield <hidden>
Date: 2011-08-20 05:11:59

On Sat, Aug 20, 2011 at 12:58 AM, Otavio Salvador
[off-list ref] wrote:
quoted hunk
Signed-off-by: Otavio Salvador <redacted>
---
 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 ff3fa46..8a56b85 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -470,6 +470,29 @@ do_sizecheck() {
 addtask sizecheck before do_install after do_compile

+do_uboot_mkimage() {
+    if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
+        ENTRYPOINT=${UBOOT_ENTRYPOINT}
+        if test -n "${UBOOT_ENTRYSYMBOL}"; then
+            ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
+                   awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
+        fi
These aren't equivalent. We should maintain what is already in kernel.bbclass
and just move it over. If there already a uImage in the build tree, there's no
need to run all the objcopy "mess" below. I found that it created useless binary
blobs forme in the past.

Bruce
quoted hunk
+        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
+}
+
+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"
@@ -481,22 +504,6 @@ kernel_do_deploy() {
               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.2.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"

Re: [PATCH 3/8] kernel.bbclass: move uboot image generation to a specific class

From: Otavio Salvador <hidden>
Date: 2011-08-20 05:17:40

On Sat, Aug 20, 2011 at 02:07, Bruce Ashfield [off-list ref] wrote:
These aren't equivalent. We should maintain what is already in kernel.bbclass
and just move it over. If there already a uImage in the build tree, there's no
need to run all the objcopy "mess" below. I found that it created useless binary
blobs forme in the past.
In this case can you take a look on this and also fix it in meta-oe?
The class had some differences and I do think we ought to avoid those
as much as possible since it only makes debugging harder.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [PATCH 7/8] scripts/runqemu: remove redundant checking

From: Phil Blundell <philb@gnu.org>
Date: 2011-08-20 08:59:18

On Sat, 2011-08-20 at 04:58 +0000, Otavio Salvador wrote:
quoted hunk
Signed-off-by: Otavio Salvador <redacted>
---
 scripts/runqemu |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index 91c3c9e..d617f79 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -163,7 +163,7 @@ while [ $i -le $# ]; do
             # A directory name is an nfs rootfs
             if [ -d "$arg" ]; then
                 echo "Assuming $arg is an nfs rootfs"
-                if [[ -z "$FSTYPE" || "$FSTYPE" == "nfs" ]]; then
+                if [[ -z "$FSTYPE" ]]; then
                     FSTYPE=nfs
                 else
                     echo "Error: conflicting FSTYPE types [$arg] and nfs"
Can you explain why this test is redundant?  From inspection of the
patch it seems this would lead to "Error: conflicting FSTYPE types [nfs]
and nfs" if FSTYPE="nfs" to begin with.  I guess there is some other
provision in the logic to make sure that this can't happen, but it would
be useful to have it explained in the checkin message.

p.



Re: [PATCH 3/8] kernel.bbclass: move uboot image generation to a specific class

From: Bruce Ashfield <hidden>
Date: 2011-08-20 12:52:58

On Sat, Aug 20, 2011 at 1:12 AM, Otavio Salvador
[off-list ref] wrote:
On Sat, Aug 20, 2011 at 02:07, Bruce Ashfield [off-list ref] wrote:
quoted
These aren't equivalent. We should maintain what is already in kernel.bbclass
and just move it over. If there already a uImage in the build tree, there's no
need to run all the objcopy "mess" below. I found that it created useless binary
blobs forme in the past.
In this case can you take a look on this and also fix it in meta-oe?
The class had some differences and I do think we ought to avoid those
as much as possible since it only makes debugging harder.
I'm not a meta-oe user. I can look into this, but it will be some time, since
my plate is full with yocto 1.1 release items. I just wanted to point out that
this patch isn't just a movement of code and can't go in as-is, without a good
reason.

Cheers,

Bruce
--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

_______________________________________________
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"

Re: [PATCH 3/8] kernel.bbclass: move uboot image generation to a specific class

From: Andrea Adami <hidden>
Date: 2011-08-20 22:19:30

On 8/20/11, Bruce Ashfield [off-list ref] wrote:
On Sat, Aug 20, 2011 at 1:12 AM, Otavio Salvador
[off-list ref] wrote:
quoted
On Sat, Aug 20, 2011 at 02:07, Bruce Ashfield [off-list ref]
wrote:
quoted
These aren't equivalent. We should maintain what is already in
kernel.bbclass
and just move it over. If there already a uImage in the build tree,
there's no
need to run all the objcopy "mess" below. I found that it created useless
binary
blobs forme in the past.
In this case can you take a look on this and also fix it in meta-oe?
The class had some differences and I do think we ought to avoid those
as much as possible since it only makes debugging harder.
I'm not a meta-oe user. I can look into this, but it will be some time,
since
my plate is full with yocto 1.1 release items. I just wanted to point out
that
this patch isn't just a movement of code and can't go in as-is, without a
good
reason.

There are more differences than this:

+uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a
${UBOOT_LOADADDRESS} -
-uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT}

It looks to me the line should set -a ${UBOOT_LOADADDRESS}

Regards

Andrea
Cheers,

Bruce
quoted
--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

_______________________________________________
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"

_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [PATCH 2/8] kernel.bbclass: blacklist perf-dbg

From: Saul Wold <hidden>
Date: 2011-08-22 18:34:23

On 08/19/2011 09:58 PM, Otavio Salvador wrote:
quoted hunk
Signed-off-by: Otavio Salvador<redacted>
---
  meta/classes/kernel.bbclass |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index a2b10f2..ff3fa46 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -440,7 +440,7 @@ python populate_packages_prepend () {
  	metapkg = "kernel-modules"
  	bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
  	bb.data.setVar('FILES_' + metapkg, "", d)
-	blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf', 'kernel-misc' ]
+	blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf', 'perf-dbg', 'kernel-misc' ]
  	for l in module_deps.values():
  		for i in l:
  			pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1))
A possible better question is why perf-dbg is getting generated and what's in it?

BTW, as noted elsewhere, it would be good to add additional comments as to why you are doing some of the changes.

Thanks
	Sau!

Re: [PATCH 2/8] kernel.bbclass: blacklist perf-dbg

From: Otavio Salvador <hidden>
Date: 2011-08-22 18:58:15

On Mon, Aug 22, 2011 at 15:29, Saul Wold [off-list ref] wrote:
A possible better question is why perf-dbg is getting generated and what's
in it?
I am sorry but I don't know the answer for it.
BTW, as noted elsewhere, it would be good to add additional comments as to
why you are doing some of the changes.
Reducing the delta between meta-oe and oe-core classes; that's why I
did this change.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [PATCH 5/8] fix SDK building due TARGET_ARCH use in installation path

From: Saul Wold <hidden>
Date: 2011-08-22 22:03:38

On 08/19/2011 09:58 PM, Otavio Salvador wrote:
quoted hunk
TARGET_ARCH makes the building too fragile since it changes during
building of target and nativesdk binaries thus making it difficult to
handle a proper path for installation of binaries. The fix for it is
to move it to toolchain tarball name.

Signed-off-by: Otavio Salvador<redacted>
---
  meta/classes/populate_sdk.bbclass |    2 +-
  meta/conf/bitbake.conf            |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/populate_sdk.bbclass b/meta/classes/populate_sdk.bbclass
index 0f3591b..929f730 100644
--- a/meta/classes/populate_sdk.bbclass
+++ b/meta/classes/populate_sdk.bbclass
@@ -9,7 +9,7 @@ SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${TARGET_SYS}"

  TOOLCHAIN_HOST_TASK ?= "task-sdk-host-nativesdk task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
  TOOLCHAIN_TARGET_TASK ?= "task-core-standalone-sdk-target task-core-standalone-sdk-target-dbg"
-TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}"
+TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-${SDK_ARCH}-${TARGET_ARCH}-toolchain-${DISTRO_VERSION}"

  RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
  DEPENDS = "virtual/fakeroot-native sed-native"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b309516..b5c6696 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -361,7 +361,7 @@ DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"

  PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"

-SDK_NAME = "oecore-${SDK_ARCH}-${TARGET_ARCH}"
+SDK_NAME = "oecore-sdk-${DISTRO}"
  SDKPATH = "/usr/local/${SDK_NAME}"
  SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}"
This is the same set that has been rejected before.

I think this has been discussed before between Richard and Koen, Koen was going to look into a variation that Richard suggested, I am not sure if Koen has replied to that email (from back in early July).

Sau!

Re: [PATCH 5/8] fix SDK building due TARGET_ARCH use in installation path

From: Otavio Salvador <hidden>
Date: 2011-08-23 11:59:20

On Mon, Aug 22, 2011 at 18:58, Saul Wold [off-list ref] wrote:
On 08/19/2011 09:58 PM, Otavio Salvador wrote:
quoted
TARGET_ARCH makes the building too fragile since it changes during
building of target and nativesdk binaries thus making it difficult to
handle a proper path for installation of binaries. The fix for it is
to move it to toolchain tarball name.
...
This is the same set that has been rejected before.

I think this has been discussed before between Richard and Koen, Koen was
going to look into a variation that Richard suggested, I am not sure if Koen
has replied to that email (from back in early July).
It seems that the current way is broken and this even this solution is
not perfect this improves it a lot and works for most use cases.

Richard and Koen might make clear their concerns about it and then we
work to fix them, otherwise this is better then what we have now.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [PATCH 0/8] Pending patches from O.S. Systems tree

From: Saul Wold <hidden>
Date: 2011-08-24 04:01:15

On 08/19/2011 09:58 PM, Otavio Salvador wrote:
The following changes since commit c539155c51e43680711130df9050d3e92282591e:

   newt: update distro tracking fields (2011-08-19 09:05:54 -0700)

are available in the git repository at:
   git://github.com/OSSystems/oe-core master
   https://github.com/OSSystems/oe-core/tree/master

Otavio Salvador (8):
   Use OECORE_DISTRO_VERSION instead of POKY_DISTRO_VERSION
Merged
   kernel.bbclass: blacklist perf-dbg
Not Merged - Need to figure out why perf-dbg is being generated.
   kernel.bbclass: move uboot image generation to a specific class
Not Merged - See disussion on list
   kernel.bbclass: save kernel image name into $kerneldir
Merged
   fix SDK building due TARGET_ARCH use in installation path
Not Merged Pending RP and Koen discussion
   scripts/runqemu: add support to pass bootparams to kernel
Merged
   scripts/runqemu: remove redundant checking
Not merged (See Phil's email)
   scripts/combo-layer: fix configuration file handling
Merged
  meta/classes/kernel.bbclass            |   47 ++++++++++++++++++++-----------
  meta/classes/populate_sdk.bbclass      |    2 +-
  meta/classes/toolchain-scripts.bbclass |   12 ++++----
  meta/conf/bitbake.conf                 |    2 +-
  scripts/combo-layer                    |    4 +-
  scripts/oe-find-native-sysroot         |    2 +-
  scripts/runqemu                        |    5 +++-
  scripts/runqemu-export-rootfs          |    2 +-
  8 files changed, 46 insertions(+), 30 deletions(-)
Thanks
	Sau!

Re: [PATCH 7/8] scripts/runqemu: remove redundant checking

From: Otavio Salvador <hidden>
Date: 2011-08-24 17:05:34

On Sat, Aug 20, 2011 at 05:54, Phil Blundell [off-list ref] wrote:
Can you explain why this test is redundant?  From inspection of the
patch it seems this would lead to "Error: conflicting FSTYPE types [nfs]
and nfs" if FSTYPE="nfs" to begin with.  I guess there is some other
provision in the logic to make sure that this can't happen, but it would
be useful to have it explained in the checkin message.
I rechecked it and I agree with you; I dropped it from my tree.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help