summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-07-05 20:49:06 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-06 22:55:02 +0100
commitbf669ec97ff1b1ecd37757e06f5368d89d85393f (patch)
treec6a1c056b62f30287915983b2a3a9fc4cd179667
parent5fc11ac1700fab9ddb4437e2ee9514767387a5a9 (diff)
downloadpoky-bf669ec97ff1b1ecd37757e06f5368d89d85393f.tar.gz
quilt.inc: minor recipe formatting tweaks
Minor comment update and re-order variables to align more closely to the OE style-guide. (From OE-Core rev: 0b0c294ed3a9f901b9a6afaf984ff4958c327c0e) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/quilt/quilt.inc20
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
index ff94cc99fa..48ed9babf7 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt.inc
@@ -18,15 +18,6 @@ inherit autotools-brokensep ptest
18 18
19CLEANBROKEN = "1" 19CLEANBROKEN = "1"
20 20
21PACKAGES += "guards guards-doc"
22FILES_${PN} = "${sysconfdir} ${datadir}/quilt \
23 ${bindir}/quilt ${libdir}/quilt"
24FILES_guards = "${bindir}/guards"
25FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}"
26FILES_guards-doc = "${mandir}/man1/guards.1"
27
28RDEPENDS_${PN} = "bash"
29
30EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch" 21EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch"
31 22
32CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash" 23CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash"
@@ -42,7 +33,7 @@ do_configure_append () {
42 sed -e 's,^COMPAT_SYMLINKS.*:=.*,COMPAT_SYMLINKS :=,' -i ${S}/Makefile 33 sed -e 's,^COMPAT_SYMLINKS.*:=.*,COMPAT_SYMLINKS :=,' -i ${S}/Makefile
43} 34}
44 35
45# quilt ignores DESTDIR 36# quilt Makefiles install to BUILD_ROOT instead of DESTDIR
46do_install () { 37do_install () {
47 oe_runmake 'BUILD_ROOT=${D}' install 38 oe_runmake 'BUILD_ROOT=${D}' install
48 # cleanup unpackaged files 39 # cleanup unpackaged files
@@ -62,6 +53,15 @@ do_install_ptest() {
62 cp ${WORKDIR}/test.sh ${D}${PTEST_PATH} 53 cp ${WORKDIR}/test.sh ${D}${PTEST_PATH}
63} 54}
64 55
56PACKAGES += "guards guards-doc"
57
58FILES_${PN} = "${sysconfdir} ${datadir}/quilt \
59 ${bindir}/quilt ${libdir}/quilt"
60FILES_guards = "${bindir}/guards"
61FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}"
62FILES_guards-doc = "${mandir}/man1/guards.1"
63
64RDEPENDS_${PN} = "bash"
65RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \ 65RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \
66 perl-module-filehandle perl-module-getopt-std \ 66 perl-module-filehandle perl-module-getopt-std \
67 perl-module-posix perl-module-file-temp \ 67 perl-module-posix perl-module-file-temp \