diff options
Diffstat (limited to 'meta/recipes-devtools/quilt')
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt-native.inc | 18 | ||||
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt-native_0.64.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt-native_0.67.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt.inc | 79 | ||||
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt/Makefile | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt/aclocal.patch | 128 | ||||
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt/install.patch | 13 | ||||
| -rwxr-xr-x | meta/recipes-devtools/quilt/quilt/run-ptest | 5 | ||||
| -rwxr-xr-x | meta/recipes-devtools/quilt/quilt/test.sh | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt_0.64.bb | 16 | ||||
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt_0.67.bb | 3 |
12 files changed, 95 insertions, 204 deletions
diff --git a/meta/recipes-devtools/quilt/quilt-native.inc b/meta/recipes-devtools/quilt/quilt-native.inc deleted file mode 100644 index 5c4b0a217e..0000000000 --- a/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 = "--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/meta/recipes-devtools/quilt/quilt-native_0.64.bb b/meta/recipes-devtools/quilt/quilt-native_0.64.bb deleted file mode 100644 index 6bc7dcdb7a..0000000000 --- a/meta/recipes-devtools/quilt/quilt-native_0.64.bb +++ /dev/null @@ -1,2 +0,0 @@ -require quilt.inc -require quilt-native.inc diff --git a/meta/recipes-devtools/quilt/quilt-native_0.67.bb b/meta/recipes-devtools/quilt/quilt-native_0.67.bb new file mode 100644 index 0000000000..22374425fa --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt-native_0.67.bb @@ -0,0 +1,2 @@ +require quilt.inc +inherit native diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index 837b36ba8c..19532051cd 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc @@ -1,62 +1,91 @@ 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" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ - file://install.patch \ file://run-ptest \ file://Makefile \ + file://test.sh \ + file://0001-tests-Allow-different-output-from-mv.patch \ " -SRC_URI[md5sum] = "fc0310db5868a0873d602d4332a76d43" -SRC_URI[sha256sum] = "c4bfd3282214a288e8d3e921ae4d52e73e24c4fead72b5446752adee99a7affd" +SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch" + +SRC_URI[sha256sum] = "3be3be0987e72a6c364678bb827e3e1fcc10322b56bc5f02b576698f55013cc2" inherit autotools-brokensep ptest -EXTRA_OECONF_darwin += "--without-date \ - --without-getopt \ - " +INHIBIT_AUTOTOOLS_DEPS:class-native = "1" +PATCHTOOL:class-native = "patch" 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" +EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch" +EXTRA_OECONF:append:class-native = " --disable-nls" +EXTRA_AUTORECONF += "--exclude=aclocal" -RDEPENDS_${PN} = "bash" +CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash ac_cv_path_COLUMN=column" -EXTRA_OE_MAKE_ARGS_darwin ?= "" -EXTRA_OE_MAKE_ARGS ?= "BUILD_ROOT=${D}" +# Make sure we don't have "-w" in shebang lines: it breaks using +# "/usr/bin/env perl" as parser +do_configure:prepend () { + find ${S} -name "*.in" -exec sed -i -e "1s,^#\!.*@PERL@ -w$,#\! @PERL@\nuse warnings;," {} \; +} -CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash" +# Don't setup symlinks to host utilities, we don't need them +do_configure:append () { + sed -e 's,^COMPAT_SYMLINKS.*:=.*,COMPAT_SYMLINKS :=,' -i ${S}/Makefile +} + +do_configure:class-native () { + oe_runconf +} -# quilt ignores DESTDIR +# quilt Makefiles install to BUILD_ROOT instead of DESTDIR do_install () { - oe_runmake ${EXTRA_OE_MAKE_ARGS} install + oe_runmake 'BUILD_ROOT=${D}' install # cleanup unpackaged files 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 } do_install_ptest() { - tar -cf - bin/ --exclude \*.in | ( cd ${D}${PTEST_PATH} && tar -xf - ) - tar -cf - compat/ --exclude \*.in | ( cd ${D}${PTEST_PATH} && tar -xf - ) - tar -cf - quilt/ --exclude \*.in | ( cd ${D}${PTEST_PATH} && tar -xf - ) - tar -cf - test/ --exclude mail.test --exclude delete.test | ( cd ${D}${PTEST_PATH} && tar -xf - ) + tar -c --exclude=\*.in bin/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) + tar -c --exclude=\*.in compat/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) + tar -c --exclude=\*.in quilt/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) + tar -c --exclude=mail.test --exclude=delete.test test/ | ( cd ${D}${PTEST_PATH} && tar -xf - && chmod 777 test) cp ${WORKDIR}/Makefile ${D}${PTEST_PATH} + cp ${WORKDIR}/test.sh ${D}${PTEST_PATH} } -RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \ +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 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/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch b/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch new file mode 100644 index 0000000000..6d0f4aedfd --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch @@ -0,0 +1,29 @@ +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 + +busybox mv has different error messages: fix the test + +Upstream-Status: Inappropriate [embedded] +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + test/failbackup.test | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/failbackup.test b/test/failbackup.test +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 [`']?patches/test.diff'? to [`']?patches/test.diff~'?: Permission denied ++ >~ mv: .*: Permission denied + $ echo %{?} + > 1 + +-- +2.17.1 + diff --git a/meta/recipes-devtools/quilt/quilt/Makefile b/meta/recipes-devtools/quilt/quilt/Makefile index 7b3ac8a492..1f6cd2479c 100644 --- a/meta/recipes-devtools/quilt/quilt/Makefile +++ b/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/meta/recipes-devtools/quilt/quilt/aclocal.patch b/meta/recipes-devtools/quilt/quilt/aclocal.patch deleted file mode 100644 index daf44295ec..0000000000 --- a/meta/recipes-devtools/quilt/quilt/aclocal.patch +++ /dev/null @@ -1,128 +0,0 @@ -Upstream-Status: Pending - -Add the aclocal.m4 as acinclude.m4 - -Index: quilt-0.47/acinclude.m4 -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ quilt-0.47/acinclude.m4 2006-10-10 17:05:56.000000000 +0100 -@@ -0,0 +1,119 @@ -+dnl Allow configure to specify a specific binary -+dnl 1: Environment variable -+dnl 2: binary name -+dnl 3: optional list of alternative binary names -+dnl 4: optional list of additional search directories -+AC_DEFUN([QUILT_COMPAT_PROG_PATH],[ -+ m4_define([internal_$2_cmd],[esyscmd(ls compat/$2.in 2>/dev/null)]) -+ -+ AC_ARG_WITH($2, AC_HELP_STRING( -+ [--with-$2], [name of the $2 executable to use] -+ m4_if(internal_$2_cmd,[],[],[ (use --without-$2 -+ to use an internal mechanism)])), -+ [ -+ if test x"$withval" = xnone; then -+ AC_MSG_ERROR([Invalid configure argument. use --without-$2]) -+ fi -+ if test x"$withval" != xno; then -+ AC_MSG_CHECKING(for $2) -+ $1="$withval" -+ if test -e "$$1"; then -+ if test ! -f "$$1" -a ! -h "$$1" || test ! -x "$$1"; then -+ AC_MSG_ERROR([$$1 is not an executable file]) -+ fi -+ fi -+ AC_MSG_RESULT([$$1]) -+ if test ! -e "$$1"; then -+ AC_MSG_WARN([$$1 does not exist]) -+ fi -+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" -+ fi -+ ],[ -+ m4_if([$3],[],[ -+ AC_PATH_PROG($1,$2,,$PATH:$4) -+ ],[ -+ AC_PATH_PROGS($1,$3,,$PATH:$4) -+ if test -n "$$1" -a "`expr "$$1" : '.*/\([[^/]]*\)$'`" != "$2"; then -+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" -+ fi -+ ]) -+ m4_if([$4],[],[],[ -+ if test -n "$$1"; then -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+ for dir in "$4"; do -+ if test "`dirname $$1`" = "$dir"; then -+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" -+ break -+ fi -+ done -+ IFS="$as_save_IFS" -+ fi -+ ]) -+ ]) -+ if test -z "$$1"; then -+ m4_if(internal_$2_cmd,[],[ -+ AC_MSG_ERROR([Please specify the location of $2 with the option '--with-$2']) -+ ],[ -+ AC_MSG_WARN([Using internal $2 mechanism. Use option '--with-$2' to override]) -+ COMPAT_PROGRAMS="$COMPAT_PROGRAMS $2" -+ $1=$2 -+ INTERNAL_$1=1 -+ ]) -+ fi -+ AC_SUBST($1) -+]) -+ -+dnl Allow configure to specify a specific binary -+dnl This variant is for optional binaries. -+dnl 1: Environment variable -+dnl 2: binary name -+dnl 3: optional list of alternative binary names -+dnl 4: optional list of additional search directories -+AC_DEFUN([QUILT_COMPAT_PROG_PATH_OPT],[ -+ AC_ARG_WITH($2, AC_HELP_STRING( -+ [--with-$2], [name of the $2 executable to use]), -+ [ -+ if test x"$withval" != xno; then -+ AC_MSG_CHECKING(for $2) -+ $1="$withval" -+ if test -e "$$1"; then -+ if test ! -f "$$1" -a ! -h "$$1" || test ! -x "$$1"; then -+ AC_MSG_ERROR([$$1 is not an executable file]) -+ fi -+ fi -+ AC_MSG_RESULT([$$1]) -+ if test ! -e "$$1"; then -+ AC_MSG_WARN([$$1 does not exist]) -+ fi -+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" -+ fi -+ ],[ -+ m4_if([$3],[],[ -+ AC_PATH_PROG($1,$2,,$PATH:$4) -+ ],[ -+ AC_PATH_PROGS($1,$3,,$PATH:$4) -+ if test -n "$$1" -a "`expr "$$1" : '.*/\([[^/]]*\)$'`" != "$2"; then -+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" -+ fi -+ ]) -+ m4_if([$4],[],[],[ -+ if test -n "$$1"; then -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+ for dir in "$4"; do -+ if test "`dirname $$1`" = "$dir"; then -+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" -+ break -+ fi -+ done -+ IFS="$as_save_IFS" -+ fi -+ ]) -+ if test -z "$$1"; then -+ AC_MSG_WARN([$2 not found, some optional functionalities will be missing]) -+ fi -+ ]) -+ if test -z "$$1"; then -+ $1=$2 -+ fi -+ AC_SUBST($1) -+]) diff --git a/meta/recipes-devtools/quilt/quilt/install.patch b/meta/recipes-devtools/quilt/quilt/install.patch deleted file mode 100644 index e2a7af6550..0000000000 --- a/meta/recipes-devtools/quilt/quilt/install.patch +++ /dev/null @@ -1,13 +0,0 @@ -Upstream-Status: Pending - ---- quilt-0.47/Makefile.in 2008-12-31 19:09:13.000000000 +0000 -+++ quilt-0.47/Makefile.in.orig 2008-08-21 13:21:32.000000000 +0100 -@@ -13,7 +13,7 @@ - mandir := @mandir@ - localedir := $(datadir)/locale - emacsdir := $(datadir)/emacs/site-lisp --etcdir := $(subst /usr/etc,/etc,$(prefix)/etc) -+etcdir := @sysconfdir@ - - INSTALL := @INSTALL@ - POD2MAN := @POD2MAN@ diff --git a/meta/recipes-devtools/quilt/quilt/run-ptest b/meta/recipes-devtools/quilt/quilt/run-ptest index 958a9df5b6..d2de5c855a 100755 --- a/meta/recipes-devtools/quilt/quilt/run-ptest +++ b/meta/recipes-devtools/quilt/quilt/run-ptest @@ -1,5 +1,8 @@ #!/bin/sh +THIS_SH=/bin/sh ln -sf /bin/ed /usr/bin/ed -for i in `ls test/*.test |awk -F. '{print $1}' |awk -F/ '{print $2}'`; do make check-$i; if [ $? -eq 0 ]; then echo PASS: $i.test; else echo FAIL: $i.test; fi; done +/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/meta/recipes-devtools/quilt/quilt/test.sh b/meta/recipes-devtools/quilt/quilt/test.sh new file mode 100755 index 0000000000..6563e4a2fb --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt/test.sh @@ -0,0 +1 @@ +for i in `ls test/*.test |awk -F. '{print $1}' |awk -F/ '{print $2}'`; do make check-$i; if [ $? -eq 0 ]; then echo PASS: $i.test; else echo FAIL: $i.test; fi; done diff --git a/meta/recipes-devtools/quilt/quilt_0.64.bb b/meta/recipes-devtools/quilt/quilt_0.64.bb deleted file mode 100644 index 00f900a112..0000000000 --- a/meta/recipes-devtools/quilt/quilt_0.64.bb +++ /dev/null @@ -1,16 +0,0 @@ -require quilt.inc -inherit gettext -RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" -SRC_URI += "file://aclocal.patch \ - file://gnu_patch_test_fix_target.patch \ - " - -# fix build-distro specific perl path in the target perl scripts -do_install_append() { - for perlscript in ${D}${datadir}/quilt/scripts/remove-trailing-ws ${D}${datadir}/quilt/scripts/dependency-graph ${D}${datadir}/quilt/scripts/edmail ${D}${bindir}/guards - do - if [ -f $perlscript ]; then - sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' $perlscript - fi - done -} diff --git a/meta/recipes-devtools/quilt/quilt_0.67.bb b/meta/recipes-devtools/quilt/quilt_0.67.bb new file mode 100644 index 0000000000..bf9e3c720f --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt_0.67.bb @@ -0,0 +1,3 @@ +require quilt.inc +inherit gettext + |