diff options
-rw-r--r-- | meta/recipes-devtools/quilt/quilt.inc | 20 |
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 | ||
19 | CLEANBROKEN = "1" | 19 | CLEANBROKEN = "1" |
20 | 20 | ||
21 | PACKAGES += "guards guards-doc" | ||
22 | FILES_${PN} = "${sysconfdir} ${datadir}/quilt \ | ||
23 | ${bindir}/quilt ${libdir}/quilt" | ||
24 | FILES_guards = "${bindir}/guards" | ||
25 | FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}" | ||
26 | FILES_guards-doc = "${mandir}/man1/guards.1" | ||
27 | |||
28 | RDEPENDS_${PN} = "bash" | ||
29 | |||
30 | EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch" | 21 | EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch" |
31 | 22 | ||
32 | CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash" | 23 | CACHED_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 |
46 | do_install () { | 37 | do_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 | ||
56 | PACKAGES += "guards guards-doc" | ||
57 | |||
58 | FILES_${PN} = "${sysconfdir} ${datadir}/quilt \ | ||
59 | ${bindir}/quilt ${libdir}/quilt" | ||
60 | FILES_guards = "${bindir}/guards" | ||
61 | FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}" | ||
62 | FILES_guards-doc = "${mandir}/man1/guards.1" | ||
63 | |||
64 | RDEPENDS_${PN} = "bash" | ||
65 | RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \ | 65 | RDEPENDS_${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 \ |