From 0b0c294ed3a9f901b9a6afaf984ff4958c327c0e Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Thu, 5 Jul 2018 20:49:06 -0700 Subject: quilt.inc: minor recipe formatting tweaks Minor comment update and re-order variables to align more closely to the OE style-guide. Signed-off-by: Andre McCurdy Signed-off-by: Richard Purdie --- meta/recipes-devtools/quilt/quilt.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'meta') 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 CLEANBROKEN = "1" -PACKAGES += "guards guards-doc" -FILES_${PN} = "${sysconfdir} ${datadir}/quilt \ - ${bindir}/quilt ${libdir}/quilt" -FILES_guards = "${bindir}/guards" -FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}" -FILES_guards-doc = "${mandir}/man1/guards.1" - -RDEPENDS_${PN} = "bash" - EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch" CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash" @@ -42,7 +33,7 @@ do_configure_append () { sed -e 's,^COMPAT_SYMLINKS.*:=.*,COMPAT_SYMLINKS :=,' -i ${S}/Makefile } -# quilt ignores DESTDIR +# quilt Makefiles install to BUILD_ROOT instead of DESTDIR do_install () { oe_runmake 'BUILD_ROOT=${D}' install # cleanup unpackaged files @@ -62,6 +53,15 @@ do_install_ptest() { cp ${WORKDIR}/test.sh ${D}${PTEST_PATH} } +PACKAGES += "guards guards-doc" + +FILES_${PN} = "${sysconfdir} ${datadir}/quilt \ + ${bindir}/quilt ${libdir}/quilt" +FILES_guards = "${bindir}/guards" +FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}" +FILES_guards-doc = "${mandir}/man1/guards.1" + +RDEPENDS_${PN} = "bash" RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \ perl-module-filehandle perl-module-getopt-std \ perl-module-posix perl-module-file-temp \ -- cgit 1.2.3-korg