diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
| commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
| tree | 38caf00263451b5036435cdc36e035b25d32e623 /poky/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch | |
| parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
| download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz | |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch')
| -rw-r--r-- | poky/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/poky/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch b/poky/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch index 428b14ed5e..829c0c8b78 100644 --- a/poky/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch +++ b/poky/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch @@ -1,17 +1,18 @@ -From 6e82af54714392dcdf74a8aedaae7de7d0af1080 Mon Sep 17 00:00:00 2001 +From ddbefd80d74c3baaae328332458db447e1666240 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 27 Apr 2017 16:37:24 +0300 Subject: [PATCH] Move python helper scripts (used only in tests) to Python 3 Upstream-Status: Pending Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- tests/gpt-header-move | 2 +- - tests/msdos-overlap | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + tests/msdos-overlap | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/gpt-header-move b/tests/gpt-header-move -index 05cdc65..3cbcb7e 100755 +index 3dda5cb..a2b9508 100755 --- a/tests/gpt-header-move +++ b/tests/gpt-header-move @@ -1,4 +1,4 @@ @@ -21,7 +22,7 @@ index 05cdc65..3cbcb7e 100755 # open img file, subtract 33 from altlba address, and move the last 33 sectors # back by 33 sectors diff --git a/tests/msdos-overlap b/tests/msdos-overlap -index 5bddfb0..3de7d2e 100755 +index d6ae8d6..2c6747b 100755 --- a/tests/msdos-overlap +++ b/tests/msdos-overlap @@ -1,4 +1,4 @@ @@ -30,15 +31,3 @@ index 5bddfb0..3de7d2e 100755 """ Write an overlapping partition to a msdos disk -@@ -14,7 +14,7 @@ BAD_ENTRY = (0x72, 0xf5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - OFFSET = 0x1b8 - - if len(sys.argv) < 2: -- print "%s: <image or device>" -+ print("%s: <image or device>") - sys.exit(1) - - data = "".join(chr(c) for c in BAD_ENTRY) --- -2.11.0 - |