diff options
Diffstat (limited to 'meta/recipes-devtools/quilt')
-rw-r--r-- | meta/recipes-devtools/quilt/quilt-native_0.68.bb (renamed from meta/recipes-devtools/quilt/quilt-native_0.66.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/quilt/quilt.inc | 46 | ||||
-rw-r--r-- | meta/recipes-devtools/quilt/quilt/Makefile | 14 | ||||
-rwxr-xr-x | meta/recipes-devtools/quilt/quilt/run-ptest | 7 | ||||
-rwxr-xr-x | meta/recipes-devtools/quilt/quilt/test.sh | 25 | ||||
-rw-r--r-- | meta/recipes-devtools/quilt/quilt_0.68.bb (renamed from meta/recipes-devtools/quilt/quilt_0.66.bb) | 1 |
6 files changed, 52 insertions, 41 deletions
diff --git a/meta/recipes-devtools/quilt/quilt-native_0.66.bb b/meta/recipes-devtools/quilt/quilt-native_0.68.bb index 22374425fa..22374425fa 100644 --- a/meta/recipes-devtools/quilt/quilt-native_0.66.bb +++ b/meta/recipes-devtools/quilt/quilt-native_0.68.bb diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index f85de384d2..19aeae510d 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc @@ -4,20 +4,18 @@ 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://run-ptest \ - file://Makefile \ file://test.sh \ file://0001-tests-Allow-different-output-from-mv.patch \ " SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch" -SRC_URI[md5sum] = "6800c2404a2c0598ab2eff92a636ba70" -SRC_URI[sha256sum] = "314b319a6feb13bf9d0f9ffa7ce6683b06919e734a41275087ea457cc9dc6e07" +SRC_URI[sha256sum] = "fe8c09de03c106e85b3737c8f03ade147c956b79ed7af485a1c8a3858db38426" inherit autotools-brokensep ptest @@ -26,8 +24,9 @@ PATCHTOOL:class-native = "patch" CLEANBROKEN = "1" -EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch" +EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch --without-sendmail" EXTRA_OECONF:append:class-native = " --disable-nls" + EXTRA_AUTORECONF += "--exclude=aclocal" CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash ac_cv_path_COLUMN=column" @@ -60,17 +59,24 @@ do_install:append:class-native () { touch ${D}${sysconfdir}/quiltrc } -do_compile_ptest() { - oe_runmake bin/patch-wrapper test/.depend -} +# The tests need to run as a non-root user, so pull in the ptest user +DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" +PACKAGE_WRITE_DEPS += "ptest-runner" do_install_ptest() { - 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} + install ${UNPACKDIR}/test.sh ${D}${PTEST_PATH} + mkdir ${D}${PTEST_PATH}/test + install ${S}/test/* ${D}${PTEST_PATH}/test + # mail needs a MTA, and the patch-wrapper is disabled + rm -f ${D}${PTEST_PATH}/test/mail.test ${D}${PTEST_PATH}/test/patch-wrapper.test +} + +# ptest.bbclass currently chowns the ptest directory explicitly, so we need to +# change permission after that has happened so the ptest user can write a +# temporary directory. +do_install_ptest_base:append() { + chgrp ptest ${D}${PTEST_PATH}/test + chmod g+w ${D}${PTEST_PATH}/test } PACKAGES += "guards guards-doc" @@ -84,9 +90,9 @@ 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 patch \ - " +RDEPENDS:${PN}-ptest += "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 ptest-runner coreutils \ + " diff --git a/meta/recipes-devtools/quilt/quilt/Makefile b/meta/recipes-devtools/quilt/quilt/Makefile deleted file mode 100644 index 1f6cd2479c..0000000000 --- a/meta/recipes-devtools/quilt/quilt/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -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 += QUILT_PC=.pc; export QUILT_PC --include test/.depend - -check-% : test/%.test - @LANG=C; LC_ALL=C; \ - export LANG LC_ALL; \ - $(CHECK_ENV); \ - cd $(<D); \ - ./run -q $(<F) diff --git a/meta/recipes-devtools/quilt/quilt/run-ptest b/meta/recipes-devtools/quilt/quilt/run-ptest index d2de5c855a..f35a756d6b 100755 --- a/meta/recipes-devtools/quilt/quilt/run-ptest +++ b/meta/recipes-devtools/quilt/quilt/run-ptest @@ -1,8 +1,3 @@ #!/bin/sh -THIS_SH=/bin/sh -ln -sf /bin/ed /usr/bin/ed -/usr/sbin/adduser --disabled-password --gecos "" quilttest -su -c "${THIS_SH} ./test.sh" quilttest -/usr/sbin/deluser quilttest -rm -f /usr/bin/ed +su -c ./test.sh ptest diff --git a/meta/recipes-devtools/quilt/quilt/test.sh b/meta/recipes-devtools/quilt/quilt/test.sh index 6563e4a2fb..7dac8f4423 100755 --- a/meta/recipes-devtools/quilt/quilt/test.sh +++ b/meta/recipes-devtools/quilt/quilt/test.sh @@ -1 +1,24 @@ -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 +#! /bin/sh + +set -e -u + +export LANG=C +export LC_ALL=C +export P=patches/ +export _P=../patches/ +export QUILTRC=$(pwd)/test/test.quiltrc +export QUILT_PC=.pc +export QUILT_DIR=/usr/share/quilt/ + +# Specify on the commandline, else runs all of the tests +TESTS=${@:-test/*.test} + +for FILENAME in $TESTS; do + TESTNAME=$(basename $FILENAME .test) + ./test/run $FILENAME + if [ $? -eq 0 ]; + then echo PASS: $TESTNAME + else + echo FAIL: $TESTNAME + fi +done diff --git a/meta/recipes-devtools/quilt/quilt_0.66.bb b/meta/recipes-devtools/quilt/quilt_0.68.bb index ff9726576e..bf9e3c720f 100644 --- a/meta/recipes-devtools/quilt/quilt_0.66.bb +++ b/meta/recipes-devtools/quilt/quilt_0.68.bb @@ -1,2 +1,3 @@ require quilt.inc inherit gettext + |