Dora backports

PATCH In review Martin Jansa 5 participants 9 messages Jan 6, 2014 – Jan 13, 2014

lore

Share & tools

lore

Martin Jansa

author

2014-01-06 10:21 UTC #0 lore raw

cover Dora backports

The following changes since commit e86622a932bbd0acdea67ecfb15c8b06c27353d8:

libsoup-2.4: add intltool-native to DEPENDS (2013-12-19 14:59:47 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib jansa/dora-backports2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/dora-backports2

Martin Jansa (1):
ltp: set PREFERRED_PROVIDER and rename runtests_noltp.sh script

Richard Purdie (1):
eglibc-initial.inc: Drop duplicate include

 meta/conf/distro/include/default-providers.inc     |   2 +
 meta/recipes-core/eglibc/eglibc-initial.inc        |   2 -
 ...tests_noltp.sh-script-so-have-unique-name.patch | 202 +++++++++++++++++++++
 meta/recipes-extended/ltp/ltp_20130503.bb          |   4 +-
 4 files changed, 207 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch

Signature · 1 line

1.8.5.2

Martin Jansa

author

2014-01-06 10:21 UTC #1 lore raw

PATCH 1/2 ltp: set PREFERRED_PROVIDER and rename runtests_noltp.sh script

From: Martin Jansa <[email protected]>

* ltp installs 2 different runtests_noltp.sh files from different directories into /opt/ltp/testcases/bin/runtests_noltp.sh last one installed wins and causes unexpected changes in buildhistory's files-in-image.txt report, rename them to have unique name as other ltp scripts have.

* also define PREFERRED_PROVIDER to resolve note shown when building with meta-oe layer:
NOTE: multiple providers are available for ltp (ltp, ltp-ddt)
NOTE: consider defining a PREFERRED_PROVIDER entry to match ltp

* use patch generated without -M
in my builds both versions worked, but Saul reported that it fails to apply with:
Applying patch 0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
patch: **** Only garbage was found in the patch input.

Now I've see the same issue on different builder (with Ubuntu 12.04).

Signed-off-by Martin Jansa <[email protected]>

Signed-off-by Saul Wold <[email protected]>

Signed-off-by Richard Purdie <[email protected]>

Signed-off-by Martin Jansa <[email protected]>

---
 meta/conf/distro/include/default-providers.inc     |   2 +
 ...tests_noltp.sh-script-so-have-unique-name.patch | 202 +++++++++++++++++++++
 meta/recipes-extended/ltp/ltp_20130503.bb          |   4 +-
 3 files changed, 207 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch

meta/conf/distro/include/default-providers.inc +2 -0

index d4b9db0..e2b0892 100644
@@ -43,3 +43,5 @@ PREFERRED_PROVIDER_udev ?= "${@base_contains('DISTRO_FEATURES','systemd','system
 # There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details
 # on this rather strange entry.
 PREFERRED_PROVIDER_bluez4 ?= "bluez4"
+# Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb
+PREFERRED_PROVIDER_ltp ?= "ltp"

meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch new file +202 -0

202 lines not on this page · raw message

meta/recipes-extended/ltp/ltp_20130503.bb +3 -1

index 387826d..9e1183c 100644
@@ -21,7 +21,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 
 DEPENDS = "attr libaio libcap acl openssl"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \
+           file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \
+"
 
 SRC_URI[md5sum] = "d448d9e9731d7ef45352fc74633cc97f"
 SRC_URI[sha256sum] = "afdb1479e73d4da7f0d4d5d3fe1570bc5fc96e3317d4a5c10c59c046d3dfa4a0"

Signature · 1 line

1.8.5.2

Martin Jansa

author

2014-01-06 10:21 UTC #2 lore raw

PATCH 2/2 eglibc-initial.inc: Drop duplicate include

In reply to Martin Jansa

From: Richard Purdie <[email protected]>

There is little point in including the file twice so lets not. The main recipe already included it.

Signed-off-by Martin Jansa <[email protected]>

Signed-off-by Richard Purdie <[email protected]>

---
 meta/recipes-core/eglibc/eglibc-initial.inc | 2 --
 1 file changed, 2 deletions(-)

meta/recipes-core/eglibc/eglibc-initial.inc +0 -2

index 83b1d2c..0f0e1cd 100644
@@ -1,5 +1,3 @@
-require eglibc-common.inc
-
 DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"

Signature · 1 line

1.8.5.2

Robert Yang

2014-01-10 06:18 UTC #3 lore raw

In reply to Martin Jansa

Hi Martin,

Thanks, please see my comments in line.

Quoted 4 lines · Martin Jansa

The following changes since commit e86622a932bbd0acdea67ecfb15c8b06c27353d8:
   libsoup-2.4: add intltool-native to DEPENDS (2013-12-19 14:59:47 +0000)

Quoted 8 lines

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/dora-backports2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/dora-backports2
Martin Jansa (1):
ltp: set PREFERRED_PROVIDER and rename runtests_noltp.sh script

I will take this.

Quoted 3 lines

Richard Purdie (1):
eglibc-initial.inc: Drop duplicate include

It seems that this is a trivial fix, I don't think it's a good idea to merge it to dora.

// Robert

Quoted 7 lines

  meta/conf/distro/include/default-providers.inc     |   2 +
  meta/recipes-core/eglibc/eglibc-initial.inc        |   2 -
  ...tests_noltp.sh-script-so-have-unique-name.patch | 202 +++++++++++++++++++++
  meta/recipes-extended/ltp/ltp_20130503.bb          |   4 +-
  4 files changed, 207 insertions(+), 3 deletions(-)

create mode 100644 meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch

Richard Purdie

2014-01-10 10:42 UTC #4 lore raw

Quoted 20 lines · Robert Yang

Hi Martin,
Thanks, please see my comments in line.
Quoted 4 lines · Martin Jansa
The following changes since commit e86622a932bbd0acdea67ecfb15c8b06c27353d8:
   libsoup-2.4: add intltool-native to DEPENDS (2013-12-19 14:59:47 +0000)
Quoted 8 lines
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/dora-backports2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/dora-backports2
Martin Jansa (1):
ltp: set PREFERRED_PROVIDER and rename runtests_noltp.sh script
I will take this.

Quoted 7 lines

Quoted 3 lines
Richard Purdie (1):
eglibc-initial.inc: Drop duplicate include
It seems that this is a trivial fix, I don't think it's a good idea to merge it to dora.

Thanks to one of the bitbake patches we backported, this "trivial" issue is now putting warnings in peoples builds so I think it might be a good idea to fix it.

Cheers,

Richard

Mark Hatle

2014-01-10 16:51 UTC #5 lore raw

Quoted 26 lines · Richard Purdie

Quoted 25 lines · Robert Yang
Hi Martin,
Thanks, please see my comments in line.
Quoted 4 lines · Martin Jansa
The following changes since commit e86622a932bbd0acdea67ecfb15c8b06c27353d8:
    libsoup-2.4: add intltool-native to DEPENDS (2013-12-19 14:59:47 +0000)
Quoted 8 lines
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/dora-backports2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/dora-backports2
Martin Jansa (1):
ltp: set PREFERRED_PROVIDER and rename runtests_noltp.sh script
I will take this.
Quoted 3 lines
Richard Purdie (1):
eglibc-initial.inc: Drop duplicate include

Quoted 6 lines

Quoted 2 lines
It seems that this is a trivial fix, I don't think it's a good idea to merge it to dora.
Thanks to one of the bitbake patches we backported, this "trivial" issue is now putting warnings in peoples builds so I think it might be a good idea to fix it.

Ya I agree. This is going to cause confusion for people. Being a small 2 line patch, and pretty easy to show that it's "safe". I'd also recommend that that backport be accepted.

--Mark

Quoted 9 lines

Cheers,
Richard
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Koen Kooi

2014-01-11 15:11 UTC #6 lore raw

Op 10 jan. 2014, om 17:51 heeft Mark Hatle <[email protected]> het volgende geschreven:

Quoted 27 lines · Richard Purdie

Quoted 26 lines · Robert Yang
Quoted 25 lines
Hi Martin,
Thanks, please see my comments in line.
Quoted 4 lines · Martin Jansa
The following changes since commit e86622a932bbd0acdea67ecfb15c8b06c27353d8:
   libsoup-2.4: add intltool-native to DEPENDS (2013-12-19 14:59:47 +0000)
Quoted 8 lines
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/dora-backports2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/dora-backports2
Martin Jansa (1):
ltp: set PREFERRED_PROVIDER and rename runtests_noltp.sh script
I will take this.
Quoted 3 lines
Richard Purdie (1):
eglibc-initial.inc: Drop duplicate include

Quoted 8 lines

Quoted 6 lines
Quoted 2 lines
It seems that this is a trivial fix, I don't think it's a good idea to merge it to dora.
Thanks to one of the bitbake patches we backported, this "trivial" issue is now putting warnings in peoples builds so I think it might be a good idea to fix it.
Ya I agree. This is going to cause confusion for people. Being a small 2 line patch, and pretty easy to show that it's "safe". I'd also recommend that that backport be accepted.

I agree as well.

regards,

Koen

Martin Jansa

author

2014-01-10 11:02 UTC #7 lore raw

In reply to Robert Yang

Quoted 21 lines · Robert Yang

Hi Martin,
Thanks, please see my comments in line.
Quoted 4 lines · Martin Jansa
The following changes since commit e86622a932bbd0acdea67ecfb15c8b06c27353d8:
   libsoup-2.4: add intltool-native to DEPENDS (2013-12-19 14:59:47 +0000)
Quoted 8 lines
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/dora-backports2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/dora-backports2
Martin Jansa (1):
ltp: set PREFERRED_PROVIDER and rename runtests_noltp.sh script
I will take this.

Quoted 7 lines

Quoted 3 lines
Richard Purdie (1):
eglibc-initial.inc: Drop duplicate include
It seems that this is a trivial fix, I don't think it's a good idea to merge it to dora.

And the warning shown in every dora build since
http://git.openembedded.org/bitbake/commit/?h=1.20&id=22e6b1c4c4afb27057689bbc94cbdf1f19f93e3d
isn't important enough reason to merge it?

Quoted 10 lines

// Robert

Quoted 7 lines

  meta/conf/distro/include/default-providers.inc     |   2 +
  meta/recipes-core/eglibc/eglibc-initial.inc        |   2 -
  ...tests_noltp.sh-script-so-have-unique-name.patch | 202 +++++++++++++++++++++
  meta/recipes-extended/ltp/ltp_20130503.bb          |   4 +-
  4 files changed, 207 insertions(+), 3 deletions(-)

create mode 100644 meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Robert Yang

2014-01-13 01:54 UTC #8 lore raw

Quoted 27 lines · Martin Jansa

Quoted 26 lines · Robert Yang
Hi Martin,
Thanks, please see my comments in line.
Quoted 4 lines · Martin Jansa
The following changes since commit e86622a932bbd0acdea67ecfb15c8b06c27353d8:
    libsoup-2.4: add intltool-native to DEPENDS (2013-12-19 14:59:47 +0000)
Quoted 8 lines
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/dora-backports2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/dora-backports2
Martin Jansa (1):
ltp: set PREFERRED_PROVIDER and rename runtests_noltp.sh script
I will take this.
Quoted 3 lines
Richard Purdie (1):
eglibc-initial.inc: Drop duplicate include

Quoted 7 lines

Quoted 2 lines
It seems that this is a trivial fix, I don't think it's a good idea to merge it to dora.
And the warning shown in every dora build since
http://git.openembedded.org/bitbake/commit/?h=1.20&id=22e6b1c4c4afb27057689bbc94cbdf1f19f93e3d
isn't important enough reason to merge it?

OK, thanks to all, I will take it.

// Robert

Quoted 11 lines

Quoted 10 lines
// Robert
Quoted 7 lines
   meta/conf/distro/include/default-providers.inc     |   2 +
   meta/recipes-core/eglibc/eglibc-initial.inc        |   2 -
   ...tests_noltp.sh-script-so-have-unique-name.patch | 202 +++++++++++++++++++++
   meta/recipes-extended/ltp/ltp_20130503.bb          |   4 +-
   4 files changed, 207 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch