helium-3rd-party/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky synced 2026-09-16 22:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

quilt: Merge recipe files into a more coherent form

Browse Source 
The style of this recipe is dated, move most of the code into the main
shared include file, making some of the configuration much clearer using
modern overrides to do so.

(From OE-Core rev: b422d94b1b42fd3be42fd1ba95dbcab10e2ab4ef)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2019-02-16 15:00:45 +00:00
parent eea86c4f0a
commit 821a6f2a17
4 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meta/recipes-devtools/quilt/quilt-native.inc
View File

@ -1,18 +0,0 @@
RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native"
INHIBIT_AUTOTOOLS_DEPS = "1"
inherit native
PATCHTOOL = "patch"
EXTRA_OECONF_append = " --disable-nls"
do_configure () {
oe_runconf
}
do_install_append () {
# Dummy quiltrc file for patch.bbclass
install -d ${D}${sysconfdir}/
touch ${D}${sysconfdir}/quiltrc
}

2
meta/recipes-devtools/quilt/quilt-native_0.65.bb
View File

@ -1,2 +1,2 @@
require quilt.inc
require quilt-native.inc
inherit native

21
meta/recipes-devtools/quilt/quilt.inc
View File

@ -11,14 +11,21 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \
file://0001-tests-Allow-different-output-from-mv.patch \
"
SRC_URI_append_class-target = " file://gnu_patch_test_fix_target.patch"
SRC_URI[md5sum] = "c67ba0228f5b7b8bbe469474661f92d6"
SRC_URI[sha256sum] = "f6cbc788e5cbbb381a3c6eab5b9efce67c776a8662a7795c7432fd27aa096819"
inherit autotools-brokensep ptest
INHIBIT_AUTOTOOLS_DEPS_class-native = "1"
PATCHTOOL_class-native = "patch"
CLEANBROKEN = "1"
EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch"
EXTRA_OECONF_append_class-native = " --disable-nls"
EXTRA_AUTORECONF += "--exclude=aclocal"
CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash"
@ -33,6 +40,10 @@ do_configure_append () {
sed -e 's,^COMPAT_SYMLINKS.*:=.*,COMPAT_SYMLINKS :=,' -i ${S}/Makefile
}
do_configure_class-native () {
oe_runconf
}
# quilt Makefiles install to BUILD_ROOT instead of DESTDIR
do_install () {
oe_runmake 'BUILD_ROOT=${D}' install
@ -40,6 +51,12 @@ do_install () {
rm -rf ${D}/${datadir}/emacs
}
do_install_append_class-native () {
# Dummy quiltrc file for patch.bbclass
install -d ${D}${sysconfdir}/
touch ${D}${sysconfdir}/quiltrc
}
do_compile_ptest() {
oe_runmake bin/patch-wrapper test/.depend
}
@ -61,7 +78,9 @@ 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} = "bash patch diffstat bzip2 util-linux"
RDEPENDS_${PN}_class-native = "diffstat-native patch-native bzip2-native"
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 \

6
meta/recipes-devtools/quilt/quilt_0.65.bb
View File

@ -1,8 +1,2 @@
require quilt.inc
inherit gettext
SRC_URI += "file://gnu_patch_test_fix_target.patch"
EXTRA_AUTORECONF += "--exclude=aclocal"
RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"