From 48c09163db18634e3071009b94645812ade285f4 Mon Sep 17 00:00:00 2001
From: Chong Lu <Chong.Lu@windriver.com>
Date: Fri, 16 May 2014 15:39:42 +0800
Subject: quilt: Update to 0.63 version
Upgrade quilt to 0.63 version and add perl-module-text-parsewords to
RDEPENDS of ptest.
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/quilt/quilt-0.61.inc | 58 -----------------------
meta/recipes-devtools/quilt/quilt-0.63.inc | 59 ++++++++++++++++++++++++
meta/recipes-devtools/quilt/quilt-native_0.61.bb | 2 -
meta/recipes-devtools/quilt/quilt-native_0.63.bb | 2 +
meta/recipes-devtools/quilt/quilt_0.61.bb | 16 -------
meta/recipes-devtools/quilt/quilt_0.63.bb | 16 +++++++
6 files changed, 77 insertions(+), 76 deletions(-)
delete mode 100644 meta/recipes-devtools/quilt/quilt-0.61.inc
create mode 100644 meta/recipes-devtools/quilt/quilt-0.63.inc
delete mode 100644 meta/recipes-devtools/quilt/quilt-native_0.61.bb
create mode 100644 meta/recipes-devtools/quilt/quilt-native_0.63.bb
delete mode 100644 meta/recipes-devtools/quilt/quilt_0.61.bb
create mode 100644 meta/recipes-devtools/quilt/quilt_0.63.bb
diff --git a/meta/recipes-devtools/quilt/quilt-0.61.inc b/meta/recipes-devtools/quilt/quilt-0.61.inc
deleted file mode 100644
index 9ae4377cbc..0000000000
--- a/meta/recipes-devtools/quilt/quilt-0.61.inc
+++ /dev/null
@@ -1,58 +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 = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \
- file://install.patch \
- file://run-ptest \
- file://Makefile \
-"
-
-SRC_URI[md5sum] = "24417eba5961592b64103bdda001ebf4"
-SRC_URI[sha256sum] = "1eec0a270ac4d41eea0fd5823603c9d2a35ab6b8ab73a90dd92ce1291b2a9fc3"
-
-inherit autotools-brokensep ptest
-
-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}"
-
-CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash"
-
-# quilt ignores DESTDIR
-do_install () {
- oe_runmake ${EXTRA_OE_MAKE_ARGS} install
- # cleanup unpackaged files
- rm -rf ${D}/${datadir}/emacs
-}
-
-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 - )
- cp ${WORKDIR}/Makefile ${D}${PTEST_PATH}
-}
-
-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 \
-"
diff --git a/meta/recipes-devtools/quilt/quilt-0.63.inc b/meta/recipes-devtools/quilt/quilt-0.63.inc
new file mode 100644
index 0000000000..f3757859ff
--- /dev/null
+++ b/meta/recipes-devtools/quilt/quilt-0.63.inc
@@ -0,0 +1,59 @@
+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 = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \
+ file://install.patch \
+ file://run-ptest \
+ file://Makefile \
+"
+
+SRC_URI[md5sum] = "c0ef4beb58a6fa72563b955e70624b6e"
+SRC_URI[sha256sum] = "2846788221aa8844c54f10239c7cbc5e88031859162bcc285449446c3cfffe52"
+
+inherit autotools-brokensep ptest
+
+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}"
+
+CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash"
+
+# quilt ignores DESTDIR
+do_install () {
+ oe_runmake ${EXTRA_OE_MAKE_ARGS} install
+ # cleanup unpackaged files
+ rm -rf ${D}/${datadir}/emacs
+}
+
+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 - )
+ cp ${WORKDIR}/Makefile ${D}${PTEST_PATH}
+}
+
+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 \
+"
diff --git a/meta/recipes-devtools/quilt/quilt-native_0.61.bb b/meta/recipes-devtools/quilt/quilt-native_0.61.bb
deleted file mode 100644
index a089a83aba..0000000000
--- a/meta/recipes-devtools/quilt/quilt-native_0.61.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require quilt-${PV}.inc
-require quilt-native.inc
diff --git a/meta/recipes-devtools/quilt/quilt-native_0.63.bb b/meta/recipes-devtools/quilt/quilt-native_0.63.bb
new file mode 100644
index 0000000000..a089a83aba
--- /dev/null
+++ b/meta/recipes-devtools/quilt/quilt-native_0.63.bb
@@ -0,0 +1,2 @@
+require quilt-${PV}.inc
+require quilt-native.inc
diff --git a/meta/recipes-devtools/quilt/quilt_0.61.bb b/meta/recipes-devtools/quilt/quilt_0.61.bb
deleted file mode 100644
index 3a08d13eaf..0000000000
--- a/meta/recipes-devtools/quilt/quilt_0.61.bb
+++ /dev/null
@@ -1,16 +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 \
- "
-
-# 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.63.bb b/meta/recipes-devtools/quilt/quilt_0.63.bb
new file mode 100644
index 0000000000..3a08d13eaf
--- /dev/null
+++ b/meta/recipes-devtools/quilt/quilt_0.63.bb
@@ -0,0 +1,16 @@
+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 \
+ "
+
+# 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