From aa31fe37e21d4e78ee0c0bb878e246e2178da05b Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 20 Dec 2016 22:17:10 -0800 Subject: quilt: 0.64 -> 0.65 * Removed install.patch since it is already in the patch. * Fix indent for file://test.sh (From OE-Core rev: bd8b1d79b50819486e5882db05abb6b358b7392a) Signed-off-by: Robert Yang Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/quilt/quilt-native_0.64.bb | 2 -- meta/recipes-devtools/quilt/quilt-native_0.65.bb | 2 ++ meta/recipes-devtools/quilt/quilt.inc | 7 +++---- meta/recipes-devtools/quilt/quilt/install.patch | 13 ------------- meta/recipes-devtools/quilt/quilt_0.64.bb | 16 ---------------- meta/recipes-devtools/quilt/quilt_0.65.bb | 16 ++++++++++++++++ 6 files changed, 21 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-devtools/quilt/quilt-native_0.64.bb create mode 100644 meta/recipes-devtools/quilt/quilt-native_0.65.bb delete mode 100644 meta/recipes-devtools/quilt/quilt/install.patch delete mode 100644 meta/recipes-devtools/quilt/quilt_0.64.bb create mode 100644 meta/recipes-devtools/quilt/quilt_0.65.bb (limited to 'meta/recipes-devtools') 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.65.bb b/meta/recipes-devtools/quilt/quilt-native_0.65.bb new file mode 100644 index 0000000000..6bc7dcdb7a --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt-native_0.65.bb @@ -0,0 +1,2 @@ +require quilt.inc +require quilt-native.inc diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index 512b798d73..9cf7bac5ee 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc @@ -5,14 +5,13 @@ 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 \ - file://test.sh \ + file://test.sh \ " -SRC_URI[md5sum] = "fc0310db5868a0873d602d4332a76d43" -SRC_URI[sha256sum] = "c4bfd3282214a288e8d3e921ae4d52e73e24c4fead72b5446752adee99a7affd" +SRC_URI[md5sum] = "c67ba0228f5b7b8bbe469474661f92d6" +SRC_URI[sha256sum] = "f6cbc788e5cbbb381a3c6eab5b9efce67c776a8662a7795c7432fd27aa096819" inherit autotools-brokensep ptest 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_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.65.bb b/meta/recipes-devtools/quilt/quilt_0.65.bb new file mode 100644 index 0000000000..00f900a112 --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt_0.65.bb @@ -0,0 +1,16 @@ +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 +} -- cgit v1.2.3-54-g00ecf