From 7579e19c2b67819a6b5b1324567564d1e4125bdc Mon Sep 17 00:00:00 2001 From: Chong Lu Date: Fri, 27 Dec 2013 18:17:40 +0800 Subject: quilt: upgrade to 0.61 (From OE-Core rev: 691a2746e95caa583f89d8fd6eed246fc3e54979) Signed-off-by: Chong Lu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/quilt/quilt-0.60.inc | 36 ------------------------ meta/recipes-devtools/quilt/quilt-0.61.inc | 36 ++++++++++++++++++++++++ meta/recipes-devtools/quilt/quilt-native_0.60.bb | 3 -- meta/recipes-devtools/quilt/quilt-native_0.61.bb | 2 ++ meta/recipes-devtools/quilt/quilt_0.60.bb | 20 ------------- meta/recipes-devtools/quilt/quilt_0.61.bb | 18 ++++++++++++ 6 files changed, 56 insertions(+), 59 deletions(-) delete mode 100644 meta/recipes-devtools/quilt/quilt-0.60.inc create mode 100644 meta/recipes-devtools/quilt/quilt-0.61.inc delete mode 100644 meta/recipes-devtools/quilt/quilt-native_0.60.bb create mode 100644 meta/recipes-devtools/quilt/quilt-native_0.61.bb delete mode 100644 meta/recipes-devtools/quilt/quilt_0.60.bb create mode 100644 meta/recipes-devtools/quilt/quilt_0.61.bb (limited to 'meta/recipes-devtools/quilt') diff --git a/meta/recipes-devtools/quilt/quilt-0.60.inc b/meta/recipes-devtools/quilt/quilt-0.60.inc deleted file mode 100644 index 18105bca02..0000000000 --- a/meta/recipes-devtools/quilt/quilt-0.60.inc +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Tool for working with series of patches" -HOMEPAGE = "http://savannah.nongnu.org/projects/quilt/" -SECTION = "devel" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \ - file://install.patch" - -SRC_URI[md5sum] = "058a08a9b626bdec9ec8c519dc92158c" -SRC_URI[sha256sum] = "3d72a292e432beb9a73f9d0acfe3a77c9b4d7e42209919bb244e9958c7cfe64b" - -inherit autotools - -EXTRA_OECONF_darwin += "--without-date \ - --without-getopt \ - " - -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" - -EXTRA_OE_MAKE_ARGS_darwin ?= "" -EXTRA_OE_MAKE_ARGS ?= "BUILD_ROOT=${D}" - -# quilt ignores DESTDIR -do_install () { - oe_runmake ${EXTRA_OE_MAKE_ARGS} install - # cleanup unpackaged files - rm -rf ${D}/${datadir}/emacs -} diff --git a/meta/recipes-devtools/quilt/quilt-0.61.inc b/meta/recipes-devtools/quilt/quilt-0.61.inc new file mode 100644 index 0000000000..41edebbf8f --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt-0.61.inc @@ -0,0 +1,36 @@ +SUMMARY = "Tool for working with series of patches" +HOMEPAGE = "http://savannah.nongnu.org/projects/quilt/" +SECTION = "devel" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \ + file://install.patch" + +SRC_URI[md5sum] = "24417eba5961592b64103bdda001ebf4" +SRC_URI[sha256sum] = "1eec0a270ac4d41eea0fd5823603c9d2a35ab6b8ab73a90dd92ce1291b2a9fc3" + +inherit autotools + +EXTRA_OECONF_darwin += "--without-date \ + --without-getopt \ + " + +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" + +EXTRA_OE_MAKE_ARGS_darwin ?= "" +EXTRA_OE_MAKE_ARGS ?= "BUILD_ROOT=${D}" + +# quilt ignores DESTDIR +do_install () { + oe_runmake ${EXTRA_OE_MAKE_ARGS} install + # cleanup unpackaged files + rm -rf ${D}/${datadir}/emacs +} diff --git a/meta/recipes-devtools/quilt/quilt-native_0.60.bb b/meta/recipes-devtools/quilt/quilt-native_0.60.bb deleted file mode 100644 index b875dbc067..0000000000 --- a/meta/recipes-devtools/quilt/quilt-native_0.60.bb +++ /dev/null @@ -1,3 +0,0 @@ -require quilt-${PV}.inc -require quilt-native.inc - diff --git a/meta/recipes-devtools/quilt/quilt-native_0.61.bb b/meta/recipes-devtools/quilt/quilt-native_0.61.bb new file mode 100644 index 0000000000..a089a83aba --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt-native_0.61.bb @@ -0,0 +1,2 @@ +require quilt-${PV}.inc +require quilt-native.inc diff --git a/meta/recipes-devtools/quilt/quilt_0.60.bb b/meta/recipes-devtools/quilt/quilt_0.60.bb deleted file mode 100644 index d866032188..0000000000 --- a/meta/recipes-devtools/quilt/quilt_0.60.bb +++ /dev/null @@ -1,20 +0,0 @@ -require quilt-${PV}.inc -inherit gettext -RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" -SRC_URI += "file://aclocal.patch \ - file://gnu_patch_test_fix_target.patch \ - " -PR = "r1" - - -CACHED_CONFIGUREVARS += "ac_cv_path_BASH=${base_bindir}/bash" - -# 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.61.bb b/meta/recipes-devtools/quilt/quilt_0.61.bb new file mode 100644 index 0000000000..565e46a39f --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt_0.61.bb @@ -0,0 +1,18 @@ +require quilt-${PV}.inc +inherit gettext +RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" +SRC_URI += "file://aclocal.patch \ + file://gnu_patch_test_fix_target.patch \ + " + +CACHED_CONFIGUREVARS += "ac_cv_path_BASH=${base_bindir}/bash" + +# 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 +} -- cgit v1.2.3-54-g00ecf