diff options
-rw-r--r-- | meta/recipes-extended/parted/files/run-ptest | 2 | ||||
-rw-r--r-- | meta/recipes-extended/parted/parted_3.4.bb | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/meta/recipes-extended/parted/files/run-ptest b/meta/recipes-extended/parted/files/run-ptest index 374f1bfbc9..c3d6fca339 100644 --- a/meta/recipes-extended/parted/files/run-ptest +++ b/meta/recipes-extended/parted/files/run-ptest | |||
@@ -2,6 +2,6 @@ | |||
2 | 2 | ||
3 | mkdir -p /etc/udev/mount.blacklist.d | 3 | mkdir -p /etc/udev/mount.blacklist.d |
4 | echo /dev/sda1 >> /etc/udev/mount.blacklist.d/parted-tmp | 4 | echo /dev/sda1 >> /etc/udev/mount.blacklist.d/parted-tmp |
5 | rm -f *.log | 5 | rm -f tests/*.log |
6 | make -C tests test-suite.log | 6 | make -C tests test-suite.log |
7 | rm /etc/udev/mount.blacklist.d/parted-tmp | 7 | rm /etc/udev/mount.blacklist.d/parted-tmp |
diff --git a/meta/recipes-extended/parted/parted_3.4.bb b/meta/recipes-extended/parted/parted_3.4.bb index fb583489f8..4b76ca4861 100644 --- a/meta/recipes-extended/parted/parted_3.4.bb +++ b/meta/recipes-extended/parted/parted_3.4.bb | |||
@@ -35,10 +35,13 @@ do_install_ptest() { | |||
35 | cp ${S}/build-aux/test-driver $t/build-aux/ | 35 | cp ${S}/build-aux/test-driver $t/build-aux/ |
36 | cp -r ${S}/tests $t | 36 | cp -r ${S}/tests $t |
37 | cp ${B}/tests/Makefile $t/tests/ | 37 | cp ${B}/tests/Makefile $t/tests/ |
38 | mkdir $t/lib | ||
39 | cp ${B}/lib/config.h $t/lib | ||
38 | sed -i "s|^VERSION.*|VERSION = ${PV}|g" $t/tests/Makefile | 40 | sed -i "s|^VERSION.*|VERSION = ${PV}|g" $t/tests/Makefile |
39 | sed -i "s|^srcdir =.*|srcdir = \.|g" $t/tests/Makefile | 41 | sed -i "s|^srcdir =.*|srcdir = \.|g" $t/tests/Makefile |
40 | sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" $t/tests/Makefile | 42 | sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" $t/tests/Makefile |
41 | sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" $t/tests/Makefile | 43 | sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = "${PTEST_PATH}"|g" $t/tests/Makefile |
44 | sed -i "s|^abs_top_builddir =.*|abs_top_builddir = "${PTEST_PATH}"|g" $t/tests/Makefile | ||
42 | sed -i "s|^Makefile:.*|Makefile:|g" $t/tests/Makefile | 45 | sed -i "s|^Makefile:.*|Makefile:|g" $t/tests/Makefile |
43 | sed -i "/^BUILDINFO.*$/d" $t/tests/Makefile | 46 | sed -i "/^BUILDINFO.*$/d" $t/tests/Makefile |
44 | for i in print-align print-max print-flags dup-clobber duplicate fs-resize; \ | 47 | for i in print-align print-max print-flags dup-clobber duplicate fs-resize; \ |
@@ -46,9 +49,8 @@ do_install_ptest() { | |||
46 | done | 49 | done |
47 | sed -e 's| ../parted||' -i $t/tests/*.sh | 50 | sed -e 's| ../parted||' -i $t/tests/*.sh |
48 | } | 51 | } |
49 | 52 | RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup util-linux-mkswap python3 make gawk e2fsprogs-mke2fs e2fsprogs-tune2fs python3-core dosfstools" | |
50 | RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup python3 make gawk e2fsprogs-mke2fs python3-core dosfstools" | 53 | RRECOMMENDS_${PN}-ptest = "kernel-module-scsi-debug kernel-module-loop kernel-module-vfat" |
51 | RRECOMMENDS_${PN}-ptest = "kernel-module-scsi-debug" | ||
52 | RDEPENDS_${PN}-ptest_append_libc-glibc = "\ | 54 | RDEPENDS_${PN}-ptest_append_libc-glibc = "\ |
53 | glibc-utils \ | 55 | glibc-utils \ |
54 | locale-base-en-us \ | 56 | locale-base-en-us \ |