diff options
Diffstat (limited to 'external/poky/meta/recipes-devtools/quilt')
9 files changed, 37 insertions, 38 deletions
diff --git a/external/poky/meta/recipes-devtools/quilt/quilt-native.inc b/external/poky/meta/recipes-devtools/quilt/quilt-native.inc deleted file mode 100644 index c7067042..00000000 --- a/external/poky/meta/recipes-devtools/quilt/quilt-native.inc +++ /dev/null @@ -1,18 +0,0 @@ -RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native util-linux-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 -} diff --git a/external/poky/meta/recipes-devtools/quilt/quilt-native_0.65.bb b/external/poky/meta/recipes-devtools/quilt/quilt-native_0.65.bb deleted file mode 100644 index 6bc7dcdb..00000000 --- a/external/poky/meta/recipes-devtools/quilt/quilt-native_0.65.bb +++ /dev/null @@ -1,2 +0,0 @@ -require quilt.inc -require quilt-native.inc diff --git a/external/poky/meta/recipes-devtools/quilt/quilt-native_0.66.bb b/external/poky/meta/recipes-devtools/quilt/quilt-native_0.66.bb new file mode 100644 index 00000000..22374425 --- /dev/null +++ b/external/poky/meta/recipes-devtools/quilt/quilt-native_0.66.bb @@ -0,0 +1,2 @@ +require quilt.inc +inherit native diff --git a/external/poky/meta/recipes-devtools/quilt/quilt.inc b/external/poky/meta/recipes-devtools/quilt/quilt.inc index 48ed9bab..d6d06c04 100644 --- a/external/poky/meta/recipes-devtools/quilt/quilt.inc +++ b/external/poky/meta/recipes-devtools/quilt/quilt.inc @@ -1,4 +1,7 @@ SUMMARY = "Tool for working with series of patches" +DESCRIPTION = "Quilt is a tool to manage large sets of patches by keeping \ +track of the changes each patch makes. Patches can be applied, un-applied,\ +refreshed, etc." HOMEPAGE = "http://savannah.nongnu.org/projects/quilt/" SECTION = "devel" LICENSE = "GPLv2" @@ -11,14 +14,21 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ file://0001-tests-Allow-different-output-from-mv.patch \ " -SRC_URI[md5sum] = "c67ba0228f5b7b8bbe469474661f92d6" -SRC_URI[sha256sum] = "f6cbc788e5cbbb381a3c6eab5b9efce67c776a8662a7795c7432fd27aa096819" +SRC_URI_append_class-target = " file://gnu_patch_test_fix_target.patch" + +SRC_URI[md5sum] = "6800c2404a2c0598ab2eff92a636ba70" +SRC_URI[sha256sum] = "314b319a6feb13bf9d0f9ffa7ce6683b06919e734a41275087ea457cc9dc6e07" 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 +43,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 +54,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,10 +81,12 @@ 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 less" +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 \ perl-module-text-parsewords perl-module-overloading \ - bash util-linux-getopt \ + bash util-linux-getopt patch \ " diff --git a/external/poky/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch b/external/poky/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch index 21219a0b..6d0f4aed 100644 --- a/external/poky/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch +++ b/external/poky/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch @@ -1,4 +1,4 @@ -From 1530138960cfafbeefb95f2a760954c00b4d0ef0 Mon Sep 17 00:00:00 2001 +From e9fa816677993e520adff8bba26cb3e71f5a6665 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Wed, 29 Mar 2017 15:11:59 +0300 Subject: [PATCH] tests: Allow different output from mv @@ -12,18 +12,18 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/failbackup.test b/test/failbackup.test -index 37046f7..fce6725 100644 +index 5f0f54f..0902b12 100644 --- a/test/failbackup.test +++ b/test/failbackup.test @@ -16,7 +16,7 @@ What happens when refresh fails because of a permission error? $ cat > test.txt < This is updated test.txt. $ quilt refresh --backup -- >~ mv: cannot move [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?: Permission denied +- >~ mv: cannot move [`']?patches/test.diff'? to [`']?patches/test.diff~'?: Permission denied + >~ mv: .*: Permission denied $ echo %{?} > 1 -- -2.1.4 +2.17.1 diff --git a/external/poky/meta/recipes-devtools/quilt/quilt/Makefile b/external/poky/meta/recipes-devtools/quilt/quilt/Makefile index 7b3ac8a4..1f6cd247 100644 --- a/external/poky/meta/recipes-devtools/quilt/quilt/Makefile +++ b/external/poky/meta/recipes-devtools/quilt/quilt/Makefile @@ -2,7 +2,8 @@ PATH := $(CURDIR)/bin:$(CURDIR)/compat:$(PATH) QUILT_DIR := $(CURDIR)/quilt QUILTRC := $(CURDIR)/test/test.quiltrc export QUILT_DIR QUILTRC -CHECK_ENV := P=patches/; _P=../patches/; export P _P +CHECK_ENV := P=patches/; _P=../patches/; export P _P; +CHECK_ENV += QUILT_PC=.pc; export QUILT_PC -include test/.depend check-% : test/%.test diff --git a/external/poky/meta/recipes-devtools/quilt/quilt/run-ptest b/external/poky/meta/recipes-devtools/quilt/quilt/run-ptest index 4b808aee..d2de5c85 100755 --- a/external/poky/meta/recipes-devtools/quilt/quilt/run-ptest +++ b/external/poky/meta/recipes-devtools/quilt/quilt/run-ptest @@ -2,7 +2,7 @@ THIS_SH=/bin/sh ln -sf /bin/ed /usr/bin/ed -/usr/sbin/adduser --disabled-password quilttest +/usr/sbin/adduser --disabled-password --gecos "" quilttest su -c "${THIS_SH} ./test.sh" quilttest /usr/sbin/deluser quilttest rm -f /usr/bin/ed diff --git a/external/poky/meta/recipes-devtools/quilt/quilt_0.65.bb b/external/poky/meta/recipes-devtools/quilt/quilt_0.65.bb deleted file mode 100644 index 5bf818d0..00000000 --- a/external/poky/meta/recipes-devtools/quilt/quilt_0.65.bb +++ /dev/null @@ -1,8 +0,0 @@ -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" diff --git a/external/poky/meta/recipes-devtools/quilt/quilt_0.66.bb b/external/poky/meta/recipes-devtools/quilt/quilt_0.66.bb new file mode 100644 index 00000000..ff972657 --- /dev/null +++ b/external/poky/meta/recipes-devtools/quilt/quilt_0.66.bb @@ -0,0 +1,2 @@ +require quilt.inc +inherit gettext |