diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-devtools/quilt/quilt.inc | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-devtools/quilt/quilt.inc')
-rw-r--r-- | poky/meta/recipes-devtools/quilt/quilt.inc | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/poky/meta/recipes-devtools/quilt/quilt.inc b/poky/meta/recipes-devtools/quilt/quilt.inc index 48ed9babf..150df3d57 100644 --- a/poky/meta/recipes-devtools/quilt/quilt.inc +++ b/poky/meta/recipes-devtools/quilt/quilt.inc @@ -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 \ |