[PATCH 0/2] v2 of attr/acl with qemuimage-testlib fix

[PATCH 0/2] v2 of attr/acl with qemuimage-testlib fix

[Saul Wold]

Richard, 

These 2 patches would be for edison

Sau!

The following changes since commit 368b150416688654e35229a63b87177b52e83d02:

  populate_sdk_rpm: add pkgconfig(pkg-config) to the list (2011-09-23 19:55:43 +0100)

are available in the git repository at:
  git://git.yoctoproject.org/poky-contrib sgw/oe-fix
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/oe-fix

Saul Wold (2):
  attr/acl: add SSTATEPOSTINSTFUNC
  qemuimage-testlib: set a default geometry for xterm

 meta/recipes-support/attr/acl_2.2.51.bb  |    2 +-
 meta/recipes-support/attr/attr_2.4.46.bb |    2 +-
 meta/recipes-support/attr/ea-acl.inc     |   17 +++++++++++++++++
 scripts/qemuimage-testlib                |    4 ++--
 4 files changed, 21 insertions(+), 4 deletions(-)

-- 
1.7.6

[PATCH 1/2] attr/acl: add SSTATEPOSTINSTFUNC

[Saul Wold]

Added a native sstate post install function to fix the links
created between /lib and /usr/lib for the library files. These
links could point to an invalid build area when using shared state.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/attr/acl_2.2.51.bb  |    2 +-
 meta/recipes-support/attr/attr_2.4.46.bb |    2 +-
 meta/recipes-support/attr/ea-acl.inc     |   17 +++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/attr/acl_2.2.51.bb b/meta/recipes-support/attr/acl_2.2.51.bb
index 18aac7c..40ba5f1 100644
--- a/meta/recipes-support/attr/acl_2.2.51.bb
+++ b/meta/recipes-support/attr/acl_2.2.51.bb
@@ -1,6 +1,6 @@
 require acl.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "3fc0ce99dc5253bdcce4c9cd437bc267"
 SRC_URI[sha256sum] = "06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225"
diff --git a/meta/recipes-support/attr/attr_2.4.46.bb b/meta/recipes-support/attr/attr_2.4.46.bb
index fe8ab79..85c35d0 100644
--- a/meta/recipes-support/attr/attr_2.4.46.bb
+++ b/meta/recipes-support/attr/attr_2.4.46.bb
@@ -1,6 +1,6 @@
 require attr.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "db557c17fdfa4f785333ecda08654010"
 SRC_URI[sha256sum] = "dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f"
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index 2ef1389..22d7848 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -35,3 +35,20 @@ BBCLASSEXTEND = "native"
 # Only append ldflags for target recipe and if USE_NLS is enabled
 LDFLAGS_append_libc-uclibc = "${@['', ' -lintl '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'yes')]}"
 EXTRA_OECONF_append_libc-uclibc = "${@['', ' --disable-gettext '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'no')]}"
+
+fix_symlink () {
+	# Remove bad symlinks & create the correct symlinks
+	if test -L ${libdir}/lib${BPN}.so ; then
+		rm -rf ${libdir}/lib${BPN}.so
+		ln -sf ${base_libdir}/lib${BPN}.so ${libdir}/lib${BPN}.so
+	fi
+	if test -L ${base_libdir}/lib${BPN}.a ; then
+		rm -rf ${base_libdir}/lib${BPN}.a
+		ln -sf ${libdir}/lib${BPN}.a ${base_libdir}/lib${BPN}.a
+	fi
+	if test -L  ${base_libdir}/lib${BPN}.la ; then
+		rm -rf ${base_libdir}/lib${BPN}.la
+		ln -sf ${libdir}/lib${BPN}.la ${base_libdir}/lib${BPN}.la
+	fi
+}
+SSTATEPOSTINSTFUNCS_virtclass-native += "fix_symlink"
-- 
1.7.6

[PATCH 2/2] qemuimage-testlib: set a default geometry for xterm

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 scripts/qemuimage-testlib |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index 9ffaa7c..ee9450e 100644
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -467,8 +467,8 @@ Test_Create_Qemu()
 		export MACHINE=$QEMUARCH
 
 		# Create Qemu in localhost VNC Port 1
-		echo "Running xterm -display ${DISPLAY} -e 'TMPDIR=${TMPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE} && /bin/sleep 60' &"
-	    	xterm -display ${DISPLAY} -e "TMPDIR=${TMPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE} && /bin/sleep 60" &
+		echo "Running xterm -geometry 80x24+10+10 -ls -display ${DISPLAY} -e 'TMPDIR=${TMPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE} && /bin/sleep 60' &"
+	    	xterm -geometry 80x24+10+10 -ls -display ${DISPLAY} -e "TMPDIR=${TMPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE} && /bin/sleep 60" &
 	
 		# Get the pid of the xterm processor, which will be used in Test_Kill_Qemu
 		PID=$!
-- 
1.7.6

Re: [PATCH 0/2] v2 of attr/acl with qemuimage-testlib fix

[Richard Purdie]

On Sat, 2011-09-24 at 11:56 -0700, Saul Wold wrote:
> Richard, 
> 
> These 2 patches would be for edison
> 
> Sau!
> 
> The following changes since commit 368b150416688654e35229a63b87177b52e83d02:
> 
>   populate_sdk_rpm: add pkgconfig(pkg-config) to the list (2011-09-23 19:55:43 +0100)
> 
> are available in the git repository at:
>   git://git.yoctoproject.org/poky-contrib sgw/oe-fix
>   http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/oe-fix
> 
> Saul Wold (2):
>   attr/acl: add SSTATEPOSTINSTFUNC
>   qemuimage-testlib: set a default geometry for xterm

I've merged the first of these, thanks. I'm holding off the second until
we see the problem on the autobuilder is fixed, this doesn't have seemed
to have done so :(

Cheers,

Richard

Re: [PATCH 0/2] v2 of attr/acl with qemuimage-testlib fix

[Richard Purdie]

On Sun, 2011-09-25 at 15:29 +0100, Richard Purdie wrote:
> On Sat, 2011-09-24 at 11:56 -0700, Saul Wold wrote:
> > Richard, 
> > 
> > These 2 patches would be for edison
> > 
> > Sau!
> > 
> > The following changes since commit 368b150416688654e35229a63b87177b52e83d02:
> > 
> >   populate_sdk_rpm: add pkgconfig(pkg-config) to the list (2011-09-23 19:55:43 +0100)
> > 
> > are available in the git repository at:
> >   git://git.yoctoproject.org/poky-contrib sgw/oe-fix
> >   http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/oe-fix
> > 
> > Saul Wold (2):
> >   attr/acl: add SSTATEPOSTINSTFUNC
> >   qemuimage-testlib: set a default geometry for xterm
> 
> I've merged the first of these, thanks. I'm holding off the second until
> we see the problem on the autobuilder is fixed, this doesn't have seemed
> to have done so :(

Just to follow up, we're going to fix this with Xdefaults files on the
autobuilder so I'll not take this patch.

Saul: Can we document this somewhere (autobuilder repo's README maybe)?

Cheers,

Richard

Re: [PATCH 1/2] attr/acl: add SSTATEPOSTINSTFUNC

[Phil Blundell]

On Sat, 2011-09-24 at 11:56 -0700, Saul Wold wrote:
> +fix_symlink () {
> +	# Remove bad symlinks & create the correct symlinks
> +	if test -L ${libdir}/lib${BPN}.so ; then
> +		rm -rf ${libdir}/lib${BPN}.so
> +		ln -sf ${base_libdir}/lib${BPN}.so ${libdir}/lib${BPN}.so
> +	fi

This breaks the build for me on micro.  I end up with a symlink pointing
to itself:

lrwxrwxrwx 1 pb pb 76 2011-10-04
16:09 /home/pb/oe/build-epia/build/tmp-eglibc/sysroots/x86_64-linux/lib/libattr.so -> /home/pb/oe/build-epia/build/tmp-eglibc/sysroots/x86_64-linux/lib/libattr.so

with predictably bad results.

p.

Re: [PATCH 1/2] attr/acl: add SSTATEPOSTINSTFUNC

[Saul Wold]

On 10/04/2011 08:36 AM, Phil Blundell wrote:
> On Sat, 2011-09-24 at 11:56 -0700, Saul Wold wrote:
>> +fix_symlink () {
>> +	# Remove bad symlinks&  create the correct symlinks
>> +	if test -L ${libdir}/lib${BPN}.so ; then
>> +		rm -rf ${libdir}/lib${BPN}.so
>> +		ln -sf ${base_libdir}/lib${BPN}.so ${libdir}/lib${BPN}.so
>> +	fi
>
> This breaks the build for me on micro.  I end up with a symlink pointing
> to itself:
>
> lrwxrwxrwx 1 pb pb 76 2011-10-04
> 16:09 /home/pb/oe/build-epia/build/tmp-eglibc/sysroots/x86_64-linux/lib/libattr.so ->  /home/pb/oe/build-epia/build/tmp-eglibc/sysroots/x86_64-linux/lib/libattr.so
>
> with predictably bad results.
>
Not good, I guess the change here would be to test if base_libdir and 
libdir are the same, would you confirm that this test would be right?

Thanks
	Sau!

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

Re: [PATCH 1/2] attr/acl: add SSTATEPOSTINSTFUNC

[Phil Blundell]

On Wed, 2011-10-05 at 10:45 -0700, Saul Wold wrote:
> Not good, I guess the change here would be to test if base_libdir and 
> libdir are the same, would you confirm that this test would be right?

Yes, something like that.  Those two dirs are indeed the same on micro.

thanks

p.