Skip to contentSkip to conversation

Consolidated pull

PATCH In review Robert Yang 2 participants 9 messages Jul 5, 2016 – Jul 27, 2016

lore
Share & tools
lore
#0 lore raw

cover Consolidated pull

The following changes since commit 1f4bfa33073584c25396d74f3929f263f3df188b:

toasterconf.json: exclude releases Toaster can't build (2016-06-03 13:36:19 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/jethro-next
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/jethro-next

Anuj Mittal (1):
gcc: make sure header path is set correctly

Armin Kuster (2):
tzcode: update to 2016e
tzdata: update to 2016e

Enrico Jorns (1):
perl-ptest.inc: fix tar call to prevent objcopy failure

George McCollister (1):
wic: fix path parsing, use last occurrence

Nicolas Dechesne (1):
bluez5: move btmgmt to common READLINE section

 meta/recipes-connectivity/bluez5/bluez5_5.33.bb                  | 2 +-
 meta/recipes-devtools/gcc/gcc-target.inc                         | 1 -
 meta/recipes-devtools/perl/perl-ptest.inc                        | 4 ++--
 .../tzcode/{tzcode-native_2016d.bb => tzcode-native_2016e.bb}    | 9 +++++----
 .../recipes-extended/tzdata/{tzdata_2016d.bb => tzdata_2016e.bb} | 4 ++--
 scripts/lib/wic/plugin.py                                        | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename meta/recipes-extended/tzcode/{tzcode-native_2016d.bb => tzcode-native_2016e.bb} (67%)
 rename meta/recipes-extended/tzdata/{tzdata_2016d.bb => tzdata_2016e.bb} (98%)
Signature · 1 line
2.8.0
#1 lore raw

PATCH 1/6 bluez5: move btmgmt to common READLINE section

From: Nicolas Dechesne <[email protected]>

Upstream in 5.33 btmgmt was moved from experimental to common READLINE section, in commit e4f0c5582f1fe3451d5588243adba9de1ed68b80, but this was never updated in the recipe.

This is a backport from master branch, commit
28777e593d3dd3a5d0ee2effcdca6a971e2887f9.

---
 meta/recipes-connectivity/bluez5/bluez5_5.33.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/bluez5/bluez5_5.33.bb +1 -1
index 23c7397..3084a64 100644
@@ -10,6 +10,7 @@ NOINST_TOOLS_READLINE ?= " \
     tools/obex-server-tool \
     tools/bluetooth-player \
     tools/obexctl \
+    tools/btmgmt \
 "
 
 # noinst programs in Makefile.tools that are conditional on EXPERIMENTAL
@@ -34,7 +35,6 @@ NOINST_TOOLS_EXPERIMENTAL ?= " \
     tools/hwdb \
     tools/hcieventmask \
     tools/hcisecfilter \
-    tools/btmgmt \
     tools/btinfo \
     tools/btattach \
     tools/btsnoop \
Signature · 1 line
2.8.0
#2 lore raw

PATCH 2/6 wic: fix path parsing, use last occurrence

In reply to Robert Yang

From: George McCollister <[email protected]>

If the path contains 'scripts' more than once the first occurrence will be incorrectly used. Use rfind instead of find to find the last occurrence.

---
 scripts/lib/wic/plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/wic/plugin.py +1 -1
index ccfdfcb..151ff31 100644
@@ -42,7 +42,7 @@ class PluginMgr(object):
 
     def __init__(self):
         wic_path = os.path.dirname(__file__)
-        eos = wic_path.find('scripts') + len('scripts')
+        eos = wic_path.rfind('scripts') + len('scripts')
         scripts_path = wic_path[:eos]
         self.scripts_path = scripts_path
         self.plugin_dir = scripts_path + PLUGIN_DIR
Signature · 1 line
2.8.0
#3 lore raw

PATCH 3/6 tzcode: update to 2016e

In reply to Robert Yang

From: Armin Kuster <[email protected]>

V2: typo in title (jet lagged)
Changes to code

zic now outputs a dummy transition at time 2**31 - 1 in zones whose POSIX-style TZ strings contain a '<'. This mostly works around Qt bug 53071 <https://bugreports.qt.io/browse/QTBUG-53071>.
(Thanks to Zhanibek Adilbekov for reporting the Qt bug.)

Changes affecting documentation and commentary

tz-link.htm says why governments should give plenty of notice for time zone or DST changes, and refers to Matt Johnson's blog post. tz-link.htm mentions Tzdata for Elixir. (Thanks to Matt Johnson.)

(From OE-Core master rev: 5f3340e5c966f4233e0cd4ec468b20a1fd5a7346)

---
 .../tzcode/{tzcode-native_2016d.bb => tzcode-native_2016e.bb}    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
 rename meta/recipes-extended/tzcode/{tzcode-native_2016d.bb => tzcode-native_2016e.bb} (67%)
meta/recipes-extended/tzcode/tzcode-native_2016e.bb renamed from meta/recipes-extended/tzcode/tzcode-native_2016d.bb +5 -4
similarity index 67%
rename from meta/recipes-extended/tzcode/tzcode-native_2016d.bb
rename to meta/recipes-extended/tzcode/tzcode-native_2016e.bb
index 647ce2d..1e0f298 100644
@@ -8,10 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=76ae2becfcb9a685041c6f166b44c2c2"
 SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \
            http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata"
 
-SRC_URI[tzcode.md5sum] = "06fc6fc111cd8dd681abdc5326529afd"
-SRC_URI[tzcode.sha256sum] = "a8f33d6f87aef7e109e4769fc7f6e63637d52d07ddf6440a1a50df3d9a34e0ca"
-SRC_URI[tzdata.md5sum] = "14bf84b6c2cdab0a9428991e0150ebe6"
-SRC_URI[tzdata.sha256sum] = "d9554dfba0efd76053582bd89e8c7036ef12eee14fdd506675b08a5b59f0a1b4"
+SRC_URI[tzcode.md5sum] = "6e6d3f0046a9383aafba8c2e0708a3a3"
+SRC_URI[tzcode.sha256sum] = "57d8c4fcd5e8a90657d0e298eac5effb1a642119c92308db68d13a4612fa459e"
+
+SRC_URI[tzdata.md5sum] = "43f9f929a8baf0dd2f17efaea02c2d2a"
+SRC_URI[tzdata.sha256sum] = "ba00f899f18dc4048d7fa21f5e1fdef434496084eedc06f6caa15e5ecdb6bd81"
 
 S = "${WORKDIR}"
 
Signature · 1 line
2.8.0
#4 lore raw

PATCH 4/6 tzdata: update to 2016e

In reply to Robert Yang

From: Armin Kuster <[email protected]>

Changes affecting future time stamps

Africa/Cairo observes DST in 2016 from July 7 to the end of October. Guess October 27 and 24:00 transitions. (Thanks to Steffen Thorsen.) For future years, guess April's last Thursday to October's last Thursday except for Ramadan.

Changes affecting past time stamps

Locations while uninhabited now use '-00', not 'zzz', as a placeholder time zone abbreviation. This is inspired by Internet RFC 3339 and is more consistent with numeric time zone abbreviations already used elsewhere. The change affects several arctic and antarctic locations, e.g., America/Cambridge_Bay before 1920 and Antarctica/Troll before 2005.

Asia/Baku's 1992-09-27 transition from +04 (DST) to +04 (non-DST) was at 03:00, not 23:00 the previous day. (Thanks to Michael Deckers.)

(From OE-Core master rev: ddcf128e76ed0678ce42416531f4ecb309c57439)

---
 meta/recipes-extended/tzdata/{tzdata_2016d.bb => tzdata_2016e.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/tzdata/{tzdata_2016d.bb => tzdata_2016e.bb} (98%)
meta/recipes-extended/tzdata/tzdata_2016e.bb renamed from meta/recipes-extended/tzdata/tzdata_2016d.bb +2 -2
similarity index 98%
rename from meta/recipes-extended/tzdata/tzdata_2016d.bb
rename to meta/recipes-extended/tzdata/tzdata_2016e.bb
index 7b64c85..1c32d2a 100644
@@ -8,8 +8,8 @@ DEPENDS = "tzcode-native"
 
 SRC_URI = "http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata"
 
-SRC_URI[tzdata.md5sum] = "14bf84b6c2cdab0a9428991e0150ebe6"
-SRC_URI[tzdata.sha256sum] = "d9554dfba0efd76053582bd89e8c7036ef12eee14fdd506675b08a5b59f0a1b4"
+SRC_URI[tzdata.md5sum] = "43f9f929a8baf0dd2f17efaea02c2d2a"
+SRC_URI[tzdata.sha256sum] = "ba00f899f18dc4048d7fa21f5e1fdef434496084eedc06f6caa15e5ecdb6bd81"
 
 inherit allarch
 
Signature · 1 line
2.8.0
#5 lore raw

PATCH 5/6 gcc: make sure header path is set correctly

In reply to Robert Yang

From: Anuj Mittal <[email protected]>

We're setting the native header paths in do_configure_prepend, and don't need to set them again here.

This results in gcc-target not being able to locate the headers and not being able to detect glibc version, which in turn results in SSP support not getting detected even though it's available in libc.

(From OE-Core master rev: 85630aa894278e7818c867179dc19ca2fbd994fc)

---
 meta/recipes-devtools/gcc/gcc-target.inc | 1 -
 1 file changed, 1 deletion(-)
meta/recipes-devtools/gcc/gcc-target.inc +0 -1
index d62c15a..9cc0c3f 100644
@@ -4,7 +4,6 @@ require gcc-configure-common.inc
 EXTRA_OECONF_PATHS = "\
     --with-sysroot=/ \
     --with-build-sysroot=${STAGING_DIR_TARGET} \
-    --with-native-system-header-dir=${STAGING_DIR_TARGET}${target_includedir} \
     --with-gxx-include-dir=${includedir}/c++/${BINV} \
 "
 
Signature · 1 line
2.8.0
#6 lore raw

PATCH 6/6 perl-ptest.inc: fix tar call to prevent objcopy failure

In reply to Robert Yang

From: Enrico Jorns <[email protected]>

With tar version 1.29, the tar call used to copy the ptest files will not work anymore. While the call did not match the man page (but worked) before, anyway, the latest update of tar seems to have a more strict argument handling.

With the current version of the tar call, the copying of files still works with latest tar version, but the excludes will not be handled properly anymore.
This results in having binaries compiled with host GCC in the package. When doing the strip_and_split files in do_package() with the target objcopy, bitbake will fail with this error:

ERROR: objcopy failed with exit code 256 (cmd was [...]) [...]
File format not recognized

Thus, the current argument issues and required changes are:

* Options must be placed _before_ the pathnames.

* --exclude must be followd by a '=' in order to work properly

* 'f' options is for providing an archive file, which is unnecessary in this case

Note that this could also be a candidate for backporting.

(From OE-Core master rev: 2e498879098f7d84610aed7961d92433083d9a02)

---
 meta/recipes-devtools/perl/perl-ptest.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/perl/perl-ptest.inc +2 -2
index 948ea7c..5f0989f 100644
@@ -7,8 +7,8 @@ do_install_ptest () {
 	mkdir -p ${D}${PTEST_PATH}
 	sed -e "s:\/opt:\/usr:" -i Porting/add-package.pl
 	sed -e "s:\/local\/gnu\/:\/:" -i hints/cxux.sh
-	tar -cf - * --exclude \*.o --exclude libperl.so --exclude Makefile --exclude makefile --exclude hostperl \
-		--exclude miniperl --exclude generate_uudmap --exclude patches | ( cd ${D}${PTEST_PATH} && tar -xf - )
+	tar -c --exclude=\*.o --exclude=libperl.so --exclude=Makefile --exclude=makefile --exclude=hostperl \
+		--exclude=miniperl --exclude=generate_uudmap --exclude=patches * | ( cd ${D}${PTEST_PATH} && tar -x )
 
 	sed -i -e "s,${D},,g" \
 	       -e "s,--sysroot=${STAGING_DIR_HOST},,g" \
Signature · 1 line
2.8.0
#7 lore raw
In reply to Robert Yang

Just wanted to check - when will these changes be merged in Jethro?

Thanks,

Quoted 56 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Robert Yang
Sent: Tuesday, July 05, 2016 2:44 PM
To: [email protected]
Subject: [OE-core] [PATCH 0/6] [jethro] Consolidated pull

The following changes since commit
1f4bfa33073584c25396d74f3929f263f3df188b:

toasterconf.json: exclude releases Toaster can't build (2016-06-03 13:36:19
+0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/jethro-next
http://cgit.openembedded.org/cgit.cgi/openembedded-core-
contrib/log/?h=rbt/jethro-next

Anuj Mittal (1):
gcc: make sure header path is set correctly

Armin Kuster (2):
tzcode: update to 2016e
tzdata: update to 2016e

Enrico Jorns (1):
perl-ptest.inc: fix tar call to prevent objcopy failure

George McCollister (1):
wic: fix path parsing, use last occurrence

Nicolas Dechesne (1):
bluez5: move btmgmt to common READLINE section

 meta/recipes-connectivity/bluez5/bluez5_5.33.bb                  | 2 +-
 meta/recipes-devtools/gcc/gcc-target.inc                         | 1 -
 meta/recipes-devtools/perl/perl-ptest.inc                        | 4 ++--
 .../tzcode/{tzcode-native_2016d.bb => tzcode-native_2016e.bb}    | 9 +++++----
 .../recipes-extended/tzdata/{tzdata_2016d.bb => tzdata_2016e.bb} | 4 ++--
 scripts/lib/wic/plugin.py                                        | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename meta/recipes-extended/tzcode/{tzcode-native_2016d.bb => tzcode-
native_2016e.bb} (67%)
 rename meta/recipes-extended/tzdata/{tzdata_2016d.bb => tzdata_2016e.bb}

(98%)

--
2.8.0

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

#8 lore raw

Hi Mittal,

They are merged into jethro now.

// Robert

Quoted 61 lines · AnujX

Just wanted to check - when will these changes be merged in Jethro?

Thanks,

Quoted 56 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Robert Yang
Sent: Tuesday, July 05, 2016 2:44 PM
To: [email protected]
Subject: [OE-core] [PATCH 0/6] [jethro] Consolidated pull

The following changes since commit
1f4bfa33073584c25396d74f3929f263f3df188b:

   toasterconf.json: exclude releases Toaster can't build (2016-06-03 13:36:19

+0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/jethro-next
http://cgit.openembedded.org/cgit.cgi/openembedded-core-
contrib/log/?h=rbt/jethro-next

Anuj Mittal (1):
gcc: make sure header path is set correctly

Armin Kuster (2):
tzcode: update to 2016e
tzdata: update to 2016e

Enrico Jorns (1):
perl-ptest.inc: fix tar call to prevent objcopy failure

George McCollister (1):
wic: fix path parsing, use last occurrence

Nicolas Dechesne (1):
bluez5: move btmgmt to common READLINE section

  meta/recipes-connectivity/bluez5/bluez5_5.33.bb                  | 2 +-
  meta/recipes-devtools/gcc/gcc-target.inc                         | 1 -
  meta/recipes-devtools/perl/perl-ptest.inc                        | 4 ++--
  .../tzcode/{tzcode-native_2016d.bb => tzcode-native_2016e.bb}    | 9 +++++----
  .../recipes-extended/tzdata/{tzdata_2016d.bb => tzdata_2016e.bb} | 4 ++--
  scripts/lib/wic/plugin.py                                        | 2 +-
  6 files changed, 11 insertions(+), 11 deletions(-)

rename meta/recipes-extended/tzcode/{tzcode-native_2016d.bb => tzcode-
native_2016e.bb} (67%)
rename meta/recipes-extended/tzdata/{tzdata_2016d.bb => tzdata_2016e.bb}
(98%)

--
2.8.0

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