diff options
author | Ross Burton <ross.burton@arm.com> | 2023-01-13 16:57:01 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-15 08:49:08 +0000 |
commit | 61bb4d8e75dfaaf980c32fbe992d34f794b7c537 (patch) | |
tree | ed465076da7fbcbe6f460ae4ca64656733bf001c /meta/recipes-devtools/quilt/quilt.inc | |
parent | 11698e027d71967153b272bf34996bee8f3908e5 (diff) | |
download | poky-61bb4d8e75dfaaf980c32fbe992d34f794b7c537.tar.gz |
quilt: rewrite ptest glue
The ptest glue was overly complex. Not as many files are needed to be
installed if we tell it to use the system's quilt tools, there's no
need for a custom Makefile just to set some environment variables, and
/usr/bin/ed doesn't appear to be used at all.
(From OE-Core rev: 9a287b456347a2be44bff6f9e547795018fb729d)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/quilt/quilt.inc')
-rw-r--r-- | meta/recipes-devtools/quilt/quilt.inc | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index ec69705093..b4284dcafb 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc | |||
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | |||
9 | 9 | ||
10 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ | 10 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ |
11 | file://run-ptest \ | 11 | file://run-ptest \ |
12 | file://Makefile \ | ||
13 | file://test.sh \ | 12 | file://test.sh \ |
14 | file://0001-tests-Allow-different-output-from-mv.patch \ | 13 | file://0001-tests-Allow-different-output-from-mv.patch \ |
15 | file://fix-grep-3.8.patch \ | 14 | file://fix-grep-3.8.patch \ |
@@ -61,17 +60,12 @@ do_install:append:class-native () { | |||
61 | touch ${D}${sysconfdir}/quiltrc | 60 | touch ${D}${sysconfdir}/quiltrc |
62 | } | 61 | } |
63 | 62 | ||
64 | do_compile_ptest() { | ||
65 | oe_runmake bin/patch-wrapper test/.depend | ||
66 | } | ||
67 | |||
68 | do_install_ptest() { | 63 | do_install_ptest() { |
69 | tar -c --exclude=\*.in bin/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) | 64 | install ${WORKDIR}/test.sh ${D}${PTEST_PATH} |
70 | tar -c --exclude=\*.in compat/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) | 65 | mkdir ${D}${PTEST_PATH}/test |
71 | tar -c --exclude=\*.in quilt/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) | 66 | install ${S}/test/* ${D}${PTEST_PATH}/test |
72 | tar -c --exclude=mail.test --exclude=delete.test test/ | ( cd ${D}${PTEST_PATH} && tar -xf - && chmod 777 test) | 67 | # mail needs a MTA, and the patch-wrapper is disabled |
73 | cp ${WORKDIR}/Makefile ${D}${PTEST_PATH} | 68 | rm -f ${D}${PTEST_PATH}/test/mail.test ${D}${PTEST_PATH}/test/patch-wrapper.test |
74 | cp ${WORKDIR}/test.sh ${D}${PTEST_PATH} | ||
75 | } | 69 | } |
76 | 70 | ||
77 | PACKAGES += "guards guards-doc" | 71 | PACKAGES += "guards guards-doc" |
@@ -85,9 +79,9 @@ FILES:guards-doc = "${mandir}/man1/guards.1" | |||
85 | RDEPENDS:${PN} = "bash patch diffstat bzip2 util-linux less" | 79 | RDEPENDS:${PN} = "bash patch diffstat bzip2 util-linux less" |
86 | RDEPENDS:${PN}:class-native = "diffstat-native patch-native bzip2-native" | 80 | RDEPENDS:${PN}:class-native = "diffstat-native patch-native bzip2-native" |
87 | 81 | ||
88 | RDEPENDS:${PN}-ptest = "make file sed gawk diffutils findutils ed perl \ | 82 | RDEPENDS:${PN}-ptest += "file sed gawk diffutils findutils ed perl \ |
89 | perl-module-filehandle perl-module-getopt-std \ | 83 | perl-module-filehandle perl-module-getopt-std \ |
90 | perl-module-posix perl-module-file-temp \ | 84 | perl-module-posix perl-module-file-temp \ |
91 | perl-module-text-parsewords perl-module-overloading \ | 85 | perl-module-text-parsewords perl-module-overloading \ |
92 | bash util-linux-getopt patch \ | 86 | bash util-linux-getopt \ |
93 | " | 87 | " |