parted: move test helper scripts to Python 3

(From OE-Core rev: 2513edb9a804205480b8fbe11e0c289f283627b0)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2017-04-27 17:28:11 +03:00
committed by Richard Purdie
parent dcd53ad6f9
commit b71c46f300
2 changed files with 46 additions and 1 deletions

View File

@@ -0,0 +1,44 @@
From 6e82af54714392dcdf74a8aedaae7de7d0af1080 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(-)
diff --git a/tests/gpt-header-move b/tests/gpt-header-move
index 05cdc65..3cbcb7e 100755
--- a/tests/gpt-header-move
+++ b/tests/gpt-header-move
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
# 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
--- a/tests/msdos-overlap
+++ b/tests/msdos-overlap
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
"""
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

View File

@@ -14,6 +14,7 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
file://0001-Include-fcntl.h-in-platform_defs.h.patch \
file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
file://0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch \
file://0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch \
file://parted-3.2-sysmacros.patch \
file://run-ptest \
file://Makefile \
@@ -46,4 +47,4 @@ do_install_ptest() {
sed -e 's| ../parted||' -i $t/tests/*.sh
}
RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup python"
RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup python3"