linux/poky.git/scripts/combo-layer, branch 2.4_M2

combo-layer: handle file_exclude matching dirs

2016-10-28T15:15:21+00:00

If file_exclude matches a directory, os.unlink() got called with this directory as an argument. Filter out paths that end in a directory separator. This still leaves the (then empty) directories, but this does not affect the git commit. (From OE-Core rev: e84b9185cc8f8e9f9df0e050543bb3a2c59426c3) Signed-off-by: Olaf Mandel Signed-off-by: Richard Purdie

combo-layer: handle ambiguous git arguments

2016-10-28T15:15:18+00:00

If a branch/src-repository has the same name as a file/directory, git since 1.4.0(?) gives an error like the one below: ambiguous argument 'bitbake': both revision and filename Use '--' to separate paths from revisions, like this: 'git [...] -- [...]' Add two dashes to make the intent clear. (From OE-Core rev: a84ec3ac15a59f72fcb46d97942009c8e459b5d0) Signed-off-by: Olaf Mandel Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

combo-layer: fix crashes on wrong tempfile usage

2016-10-28T15:15:18+00:00

When calling tempfile.NamedTemporaryFile().write(str()), at least on Python 3.4.2 this fails with this error: TypeError: 'str' does not support the buffer interface Change the file-mode for all such files from binary to text mode. (From OE-Core rev: d08f3882a35eec8a042d2501715684444e353605) Signed-off-by: Olaf Mandel Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

combo-layer: python3: fix UnicodeDecodeError

2016-08-24T12:58:28+00:00

check_patch function opens patch file in text mode. This causes python3 to throw exception when calling readline(): UnicodeDecodeError: 'utf-8' codec can't decode byte 0xa7 in position NNNN: invalid start byte Opening file in binary mode and using binary type instead of strings should fix this. (From OE-Core rev: a7f1435c4c26237cdb55066c9f5408b4fdf016aa) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie

scripts: python3: change python to python3 in shebang

2016-06-03T12:13:29+00:00

(From OE-Core rev: 4b544ff388497cac82b0585f237900595523e1cb) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie

scripts: python3: decode subprocess output

2016-06-03T12:13:29+00:00

stdeout and stderr content returned by subprocess API has different types in Python 3(bytes) and Python 2(string). Decoding it to 'utf-8' makes it unicode on both pythons. (From OE-Core rev: ae4d36375683b6cfd48af25bfca70b2e77f7ade5) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie

combo-layer: python3: use tempfile.TemporaryFile

2016-06-03T12:13:29+00:00

Used tempfile.TemporaryFile() API instead of deprecated os.tmpfile(). (From OE-Core rev: bf1b411eb1cd2cc960325d5fdb0cb4f4f7b1e40e) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie

combo-layer: python3: import reduce

2016-06-03T12:13:29+00:00

Reduce is not a builtin function in python3. It has to be imported from functools. (From OE-Core rev: f9bda8b36decb5a837adcfeb1173092401988801) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie

scripts: python3: use new style except statement

2016-06-03T12:13:28+00:00

Changed old syle except statements 'except , var' to new style 'except as var' as old style is not supported in python3. (From OE-Core rev: 438eabc248f272e3d272aecaa4c9cec177b172d5) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie

scripts: python3: convert iterables to lists

2016-06-03T12:13:28+00:00

Converted return value of items() keys() and values() to lists when dictionary is modified in the loop and when the result is added to the list. (From OE-Core rev: 874a269eb1d70060c2f3b3f8b70800e2aea789f4) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie