summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch33
-rw-r--r--meta/recipes-extended/parted/files/0001-libparted-fs-add-sourcedir-lib-to-include-paths.patch26
-rw-r--r--meta/recipes-extended/parted/files/0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch66
-rw-r--r--meta/recipes-extended/parted/parted_3.4.bb (renamed from meta/recipes-extended/parted/parted_3.3.bb)9
4 files changed, 3 insertions, 131 deletions
diff --git a/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch b/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch
deleted file mode 100644
index 829c0c8b78..0000000000
--- a/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From ddbefd80d74c3baaae328332458db447e1666240 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 27 Apr 2017 16:37:24 +0300
4Subject: [PATCH] Move python helper scripts (used only in tests) to Python 3
5
6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
9---
10 tests/gpt-header-move | 2 +-
11 tests/msdos-overlap | 2 +-
12 2 files changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/tests/gpt-header-move b/tests/gpt-header-move
15index 3dda5cb..a2b9508 100755
16--- a/tests/gpt-header-move
17+++ b/tests/gpt-header-move
18@@ -1,4 +1,4 @@
19-#!/usr/bin/python
20+#!/usr/bin/env python3
21
22 # open img file, subtract 33 from altlba address, and move the last 33 sectors
23 # back by 33 sectors
24diff --git a/tests/msdos-overlap b/tests/msdos-overlap
25index d6ae8d6..2c6747b 100755
26--- a/tests/msdos-overlap
27+++ b/tests/msdos-overlap
28@@ -1,4 +1,4 @@
29-#!/usr/bin/python
30+#!/usr/bin/env python3
31 """
32 Write an overlapping partition to a msdos disk
33
diff --git a/meta/recipes-extended/parted/files/0001-libparted-fs-add-sourcedir-lib-to-include-paths.patch b/meta/recipes-extended/parted/files/0001-libparted-fs-add-sourcedir-lib-to-include-paths.patch
deleted file mode 100644
index 4dc2ab259d..0000000000
--- a/meta/recipes-extended/parted/files/0001-libparted-fs-add-sourcedir-lib-to-include-paths.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From d60a8a86f6593738b5324ccd8fe3e6d84a1fe7bc Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 11 Dec 2019 14:18:36 +0100
4Subject: [PATCH] libparted/fs: add $sourcedir/lib to include paths
5
6Otherwise, getopt-pfx-core.h won't be found.
7
8Upstream-Status: Pending
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 libparted/fs/Makefile.am | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
15index 286bff6..65f45d3 100644
16--- a/libparted/fs/Makefile.am
17+++ b/libparted/fs/Makefile.am
18@@ -3,7 +3,7 @@
19 #
20 # This file may be modified and/or distributed without restriction.
21
22-partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include
23+partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib
24
25 AM_CFLAGS = $(WARN_CFLAGS)
26
diff --git a/meta/recipes-extended/parted/files/0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch b/meta/recipes-extended/parted/files/0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch
deleted file mode 100644
index 9524adf7b8..0000000000
--- a/meta/recipes-extended/parted/files/0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch
+++ /dev/null
@@ -1,66 +0,0 @@
1From 9f844484cedb39e301b016e9da7852c1a0fb6eea Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 11 Dec 2019 16:27:48 +0100
4Subject: [PATCH] tests: use skip_ rather than skip_test_ (which is undefined)
5
6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 tests/t6001-psep.sh | 2 +-
10 tests/t6004-dm-many-partitions.sh | 2 +-
11 tests/t6005-dm-uuid.sh | 2 +-
12 tests/t6006-dm-512b-sectors.sh | 2 +-
13 4 files changed, 4 insertions(+), 4 deletions(-)
14
15diff --git a/tests/t6001-psep.sh b/tests/t6001-psep.sh
16index e350bd2..67014a0 100644
17--- a/tests/t6001-psep.sh
18+++ b/tests/t6001-psep.sh
19@@ -21,7 +21,7 @@
20 require_root_
21 require_udevadm_settle_
22
23-(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
24+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed"
25
26 # Device maps names - should be random to not conflict with existing ones on
27 # the system
28diff --git a/tests/t6004-dm-many-partitions.sh b/tests/t6004-dm-many-partitions.sh
29index b4be975..7214f60 100755
30--- a/tests/t6004-dm-many-partitions.sh
31+++ b/tests/t6004-dm-many-partitions.sh
32@@ -21,7 +21,7 @@
33
34 require_root_
35 require_udevadm_settle_
36-(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
37+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed"
38
39 ss=$sector_size_
40 ns=300
41diff --git a/tests/t6005-dm-uuid.sh b/tests/t6005-dm-uuid.sh
42index 4266747..4790a8b 100755
43--- a/tests/t6005-dm-uuid.sh
44+++ b/tests/t6005-dm-uuid.sh
45@@ -21,7 +21,7 @@
46
47 require_root_
48 require_udevadm_settle_
49-(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
50+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed"
51
52 ss=$sector_size_
53 ns=300
54diff --git a/tests/t6006-dm-512b-sectors.sh b/tests/t6006-dm-512b-sectors.sh
55index bf32135..b679adb 100644
56--- a/tests/t6006-dm-512b-sectors.sh
57+++ b/tests/t6006-dm-512b-sectors.sh
58@@ -25,7 +25,7 @@ require_scsi_debug_module_
59 grep '^#define USE_BLKID 1' "$CONFIG_HEADER" > /dev/null ||
60 skip_ 'this system lacks a new-enough libblkid'
61
62-(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
63+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed"
64
65 # Device maps names - should be random to not conflict with existing ones on
66 # the system
diff --git a/meta/recipes-extended/parted/parted_3.3.bb b/meta/recipes-extended/parted/parted_3.4.bb
index ce40c04ad4..db59189fa0 100644
--- a/meta/recipes-extended/parted/parted_3.3.bb
+++ b/meta/recipes-extended/parted/parted_3.4.bb
@@ -9,14 +9,11 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
9 file://no_check.patch \ 9 file://no_check.patch \
10 file://fix-doc-mandir.patch \ 10 file://fix-doc-mandir.patch \
11 file://0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch \ 11 file://0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch \
12 file://0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch \
13 file://run-ptest \ 12 file://run-ptest \
14 file://0001-libparted-fs-add-sourcedir-lib-to-include-paths.patch \
15 file://0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch \
16 " 13 "
17 14
18SRC_URI[md5sum] = "090655d05f3c471aa8e15a27536889ec" 15SRC_URI[md5sum] = "357d19387c6e7bc4a8a90fe2d015fe80"
19SRC_URI[sha256sum] = "57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44" 16SRC_URI[sha256sum] = "e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342"
20 17
21EXTRA_OECONF = "--disable-device-mapper" 18EXTRA_OECONF = "--disable-device-mapper"
22 19
@@ -48,7 +45,7 @@ do_install_ptest() {
48 sed -e 's| ../parted||' -i $t/tests/*.sh 45 sed -e 's| ../parted||' -i $t/tests/*.sh
49} 46}
50 47
51RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup python3 make gawk e2fsprogs-mke2fs" 48RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup python3 make gawk e2fsprogs-mke2fs python3-core"
52RRECOMMENDS_${PN}-ptest = "kernel-module-scsi-debug" 49RRECOMMENDS_${PN}-ptest = "kernel-module-scsi-debug"
53RDEPENDS_${PN}-ptest_append_libc-glibc = "\ 50RDEPENDS_${PN}-ptest_append_libc-glibc = "\
54 glibc-utils \ 51 glibc-utils \