mirror of
https://git.yoctoproject.org/poky
synced 2026-02-05 16:28:43 +01:00
parted: upgrade 3.3 -> 3.4
0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch 0001-libparted-fs-add-sourcedir-lib-to-include-paths.patch 0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch removed since they are included in 3.4 Add python3-core to RDEPENDS_parted-ptest since /usr/lib/parted/ptest/tests/msdos-overlap contained in package parted-ptest requires /usr/bin/python3 (From OE-Core rev: c7d7e5f8177cdebd580ca7ff8f4412596567aff1) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Wang Mingyu
committed by
Richard Purdie
Richard Purdie
parent
ede47ac147
commit
7a89d2d2ed
@@ -1,33 +0,0 @@
|
||||
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 | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/gpt-header-move b/tests/gpt-header-move
|
||||
index 3dda5cb..a2b9508 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 d6ae8d6..2c6747b 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
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
From d60a8a86f6593738b5324ccd8fe3e6d84a1fe7bc Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Wed, 11 Dec 2019 14:18:36 +0100
|
||||
Subject: [PATCH] libparted/fs: add $sourcedir/lib to include paths
|
||||
|
||||
Otherwise, getopt-pfx-core.h won't be found.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
libparted/fs/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
|
||||
index 286bff6..65f45d3 100644
|
||||
--- a/libparted/fs/Makefile.am
|
||||
+++ b/libparted/fs/Makefile.am
|
||||
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# This file may be modified and/or distributed without restriction.
|
||||
|
||||
-partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include
|
||||
+partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib
|
||||
|
||||
AM_CFLAGS = $(WARN_CFLAGS)
|
||||
|
||||
@@ -1,66 +0,0 @@
|
||||
From 9f844484cedb39e301b016e9da7852c1a0fb6eea Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Wed, 11 Dec 2019 16:27:48 +0100
|
||||
Subject: [PATCH] tests: use skip_ rather than skip_test_ (which is undefined)
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
tests/t6001-psep.sh | 2 +-
|
||||
tests/t6004-dm-many-partitions.sh | 2 +-
|
||||
tests/t6005-dm-uuid.sh | 2 +-
|
||||
tests/t6006-dm-512b-sectors.sh | 2 +-
|
||||
4 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/tests/t6001-psep.sh b/tests/t6001-psep.sh
|
||||
index e350bd2..67014a0 100644
|
||||
--- a/tests/t6001-psep.sh
|
||||
+++ b/tests/t6001-psep.sh
|
||||
@@ -21,7 +21,7 @@
|
||||
require_root_
|
||||
require_udevadm_settle_
|
||||
|
||||
-(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
|
||||
+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed"
|
||||
|
||||
# Device maps names - should be random to not conflict with existing ones on
|
||||
# the system
|
||||
diff --git a/tests/t6004-dm-many-partitions.sh b/tests/t6004-dm-many-partitions.sh
|
||||
index b4be975..7214f60 100755
|
||||
--- a/tests/t6004-dm-many-partitions.sh
|
||||
+++ b/tests/t6004-dm-many-partitions.sh
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
require_root_
|
||||
require_udevadm_settle_
|
||||
-(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
|
||||
+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed"
|
||||
|
||||
ss=$sector_size_
|
||||
ns=300
|
||||
diff --git a/tests/t6005-dm-uuid.sh b/tests/t6005-dm-uuid.sh
|
||||
index 4266747..4790a8b 100755
|
||||
--- a/tests/t6005-dm-uuid.sh
|
||||
+++ b/tests/t6005-dm-uuid.sh
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
require_root_
|
||||
require_udevadm_settle_
|
||||
-(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
|
||||
+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed"
|
||||
|
||||
ss=$sector_size_
|
||||
ns=300
|
||||
diff --git a/tests/t6006-dm-512b-sectors.sh b/tests/t6006-dm-512b-sectors.sh
|
||||
index bf32135..b679adb 100644
|
||||
--- a/tests/t6006-dm-512b-sectors.sh
|
||||
+++ b/tests/t6006-dm-512b-sectors.sh
|
||||
@@ -25,7 +25,7 @@ require_scsi_debug_module_
|
||||
grep '^#define USE_BLKID 1' "$CONFIG_HEADER" > /dev/null ||
|
||||
skip_ 'this system lacks a new-enough libblkid'
|
||||
|
||||
-(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
|
||||
+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed"
|
||||
|
||||
# Device maps names - should be random to not conflict with existing ones on
|
||||
# the system
|
||||
@@ -9,14 +9,11 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
|
||||
file://no_check.patch \
|
||||
file://fix-doc-mandir.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://run-ptest \
|
||||
file://0001-libparted-fs-add-sourcedir-lib-to-include-paths.patch \
|
||||
file://0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "090655d05f3c471aa8e15a27536889ec"
|
||||
SRC_URI[sha256sum] = "57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44"
|
||||
SRC_URI[md5sum] = "357d19387c6e7bc4a8a90fe2d015fe80"
|
||||
SRC_URI[sha256sum] = "e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342"
|
||||
|
||||
EXTRA_OECONF = "--disable-device-mapper"
|
||||
|
||||
@@ -48,7 +45,7 @@ do_install_ptest() {
|
||||
sed -e 's| ../parted||' -i $t/tests/*.sh
|
||||
}
|
||||
|
||||
RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup python3 make gawk e2fsprogs-mke2fs"
|
||||
RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup python3 make gawk e2fsprogs-mke2fs python3-core"
|
||||
RRECOMMENDS_${PN}-ptest = "kernel-module-scsi-debug"
|
||||
RDEPENDS_${PN}-ptest_append_libc-glibc = "\
|
||||
glibc-utils \
|
||||
Reference in New Issue
Block a user