Catching up after conference Time

GIT PULL Saul Wold 2 participants 26 messages Mar 13, 2012

lore

Share & tools

lore

Saul Wold

author

2012-03-13 08:07 UTC #0 lore raw

Richard,

Here is a collection of patches that have been pending for a little while.

There is one pending change from Bruce for poky (meta-yocto) in the MUT branch

Have built world with this code, and booted a minimal image

The following changes since commit f47ada62a3da879006e7cb27479dc9b72c56e923:

  cmake.bbclass: add ${base_libdir} to CMAKE_LIBRARY_PATH (2012-03-12 17:46:16 +0000)

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

Andreas Oberritter (10):
qt4: fix deps in libQtWebkit.la and QtWebKit.pc
udev-164: fixup "don't hardcode path to pidof" package.bbclass: sort dynamically generated packages
util-linux: explicitly disable udev
linux-firmware: fix permissions of installed files python, python-native: always set platform to linux2
python: regenerate plat-linux2/*.py
python: depend on bzip2
python-native: distutils: don't use libdir, remove dead code path python, python-native: bump PR

Bruce Ashfield (1):
linux-yocto: respect FILESPATH directories

Dexuan Cui (1):
image_types: ensure .rootfs.ext3 is created before vmdk is created.

Jeff Lance (1):
trace-cmd: modifying License information

Matthew McClintock (2):
packagedata.py: Fix get_subpkgedata_fn for multilib arch-powerpc.inc: use default value of TUNE_PKGARCH

Otavio Salvador (6):
run-postinsts: fix opkg data path
image.bbclass: fix rootfs generation without package management tools rootfs_rpm.bbclass: rename postinst trigger script
opkg: rename postinst trigger script
dpkg: rename postinst trigger script
connman: update to 0.79

Saul Wold (2):
glib-2.0: Add Upstream Status for nodbus.patch
image-vmdk: add NOISO to disable iso image creation since it's not
needed

 meta/classes/core-image.bbclass                    |    2 -
 meta/classes/image-vmdk.bbclass                    |    1 +
 meta/classes/image.bbclass                         |    7 +++-
 meta/classes/image_types.bbclass                   |    6 +++
 meta/classes/kernel-yocto.bbclass                  |   30 +++++++++++++--
 meta/classes/package.bbclass                       |    4 +-
 meta/classes/rootfs_rpm.bbclass                    |    6 ++--
 meta/conf/machine/include/powerpc/arch-powerpc.inc |    6 +--
 meta/lib/oe/packagedata.py                         |    8 ++++
 .../connman/add_xuser_dbus_permission.patch        |   12 ++++---
 .../connman/connman/disable_alg-test.patch         |   18 +++++-----
 .../connman/{connman_0.78.bb => connman_0.79.bb}   |    6 +--
 meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch   |    2 +
 meta/recipes-core/udev/udev/init                   |    2 +-
 meta/recipes-core/udev/udev_164.bb                 |    2 +-
 meta/recipes-core/util-linux/util-linux.inc        |    2 +-
 meta/recipes-core/util-linux/util-linux_2.21.bb    |    2 +-
 meta/recipes-devtools/dpkg/dpkg.inc                |    6 ++--
 .../dpkg/run-postinsts/run-postinsts               |    4 +-
 .../dpkg/run-postinsts/run-postinsts.awk           |    2 +-
 meta/recipes-devtools/dpkg/run-postinsts_1.0.bb    |    2 +-
 meta/recipes-devtools/opkg/opkg.inc                |    8 ++--
 ...2-distutils-prefix-is-inside-staging-area.patch |    6 ++--
 .../sys_platform_is_now_always_linux2.patch        |   39 ++++++++++++++++++++
 .../recipes-devtools/python/python-native_2.7.2.bb |    1 +
 meta/recipes-devtools/python/python.inc            |    2 +-
 .../python/python/07-linux3-regen-fix.patch        |   18 ---------
 .../python/sys_platform_is_now_always_linux2.patch |   39 ++++++++++++++++++++
 meta/recipes-devtools/python/python_2.7.2.bb       |   15 +++++++-
 .../linux-firmware/linux-firmware_git.bb           |    4 +-
 meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb     |    8 +++--
 meta/recipes-qt/qt4/qt4-embedded.inc               |    2 +-
 meta/recipes-qt/qt4/qt4-x11-free.inc               |    2 +-
 meta/recipes-qt/qt4/qt4.inc                        |    1 +
 34 files changed, 194 insertions(+), 81 deletions(-)
 rename meta/recipes-connectivity/connman/{connman_0.78.bb => connman_0.79.bb} (79%)
 create mode 100644 meta/recipes-devtools/python/python-native/sys_platform_is_now_always_linux2.patch
 delete mode 100644 meta/recipes-devtools/python/python/07-linux3-regen-fix.patch
 create mode 100644 meta/recipes-devtools/python/python/sys_platform_is_now_always_linux2.patch

Signature · 1 line

1.7.7.6

Saul Wold

author

2012-03-13 08:07 UTC #1 lore raw

[CONSOLIDATED PULL 01/23] linux-yocto: respect FILESPATH directories

From: Bruce Ashfield <[email protected]>

During the work to enhance the ability to specify out of tree kernel features, an assumption was made about PN being part of a patch path. This assumption is incorrect, since patches can be anywhere in the valid FILESPATH.

To make locating the patches in WORKDIR simple, we can just query patch.bbclass and return both the absolute directory of the patch and the subdirectory as it was specified on the src_uri.

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/classes/kernel-yocto.bbclass |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

meta/classes/kernel-yocto.bbclass +26 -4

index aabca78..ce125b4 100644
@@ -1,6 +1,8 @@
 S = "${WORKDIR}/linux"
 
 
+# returns local (absolute) path names for all valid patches in the
+# src_uri
 def find_patches(d):
 	patches=src_patches(d)
 	patch_list=[]

@@ -10,6 +12,7 @@ def find_patches(d):
 
 	return patch_list
 
+# returns all the elements from the src uri that are .scc files
 def find_sccs(d):
 	sources=src_patches(d, True)
 	sources_list=[]

@@ -20,6 +23,22 @@ def find_sccs(d):
 
 	return sources_list
 
+# this is different from find_patches, in that it returns a colon separated
+# list of <patches>:<subdir> instead of just a list of patches
+def find_urls(d):
+	patches=src_patches(d)
+	fetch = bb.fetch2.Fetch([], d)
+	patch_list=[]
+	for p in patches:
+		_, _, local, _, _, _ = bb.decodeurl(p)
+		for url in fetch.urls:
+			urldata = fetch.ud[url]
+			if urldata.localpath == local:
+				patch_list.append(local+':'+urldata.path)
+
+        return patch_list
+
+
 do_patch() {
 	cd ${S}
 	if [ -f ${WORKDIR}/defconfig ]; then

@@ -51,8 +70,8 @@ do_patch() {
 		exit 1
 	fi
 
-	patches="${@" ".join(find_patches(d))}"
 	sccs="${@" ".join(find_sccs(d))}"
+	patches_and_dirs="${@" ".join(find_urls(d))}"
 
 	# This loops through all patches, and looks for directories that do
 	# not already have feature descriptions. If a directory doesn't have

@@ -66,14 +85,16 @@ do_patch() {
 	# to be repeated on the SRC_URI line .. which is more intutive
 	set +e
 	patch_dirs=
-	for p in ${patches}; do
+	for pp in ${patches_and_dirs}; do
+	        p=`echo $pp | cut -f1 -d:`
+		wp=`echo $pp | cut -f2 -d:`
 		pdir=`dirname ${p}`
 		pname=`basename ${p}`
 		scc=`find ${pdir} -maxdepth 1 -name '*.scc'`
 		if [ -z "${scc}" ]; then
 			# there is no scc file. We need to switch to someplace that we know
 		        # we can create content (the workdir)
-			workdir_subdir=`echo ${pdir} | sed "s%^.*/${PN}%%" | sed 's%^/%%'`
+			workdir_subdir=`dirname ${wp}`
 			suggested_dir="${WORKDIR}/${workdir_subdir}"
 			echo ${gen_feature_dirs} | grep -q ${suggested_dir}
 			if [ $? -ne 0 ]; then

@@ -82,7 +103,8 @@ do_patch() {
 			# we call the file *.scc_tmp, so the test above will continue to find
 			# that patches from a common subdirectory don't have a scc file and 
 			# they'll be placed in order, into this file. We'll rename it later.
-			echo "patch ${pname}" >> ${suggested_dir}/gen_${workdir_subdir}_desc.scc_tmp
+			gen_feature_name="gen_`echo ${workdir_subdir} | sed 's%/%%g'`_desc.scc_tmp"
+			echo "patch ${pname}" >> ${WORKDIR}/${workdir_subdir}/${gen_feature_name}
 		else
 			suggested_dir="${pdir}"
 		fi

Signature · 1 line

1.7.7.6

Saul Wold

author

2012-03-13 08:07 UTC #2 lore raw

[CONSOLIDATED PULL 02/23] glib-2.0: Add Upstream Status for nodbus.patch