From d911601b4d4b44fceb2b586c1595e3b6601623df Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Mon, 30 Apr 2012 14:37:25 -0700 Subject: quilt: upgrade from 0.51 to 0.60 (From OE-Core rev: 0e6843e7a3ed3b12e5f2bc6273047c2be5e47489) Signed-off-by: Nitin A Kamble Signed-off-by: Richard Purdie --- meta/recipes-devtools/quilt/quilt-0.51.inc | 29 ------------------------ meta/recipes-devtools/quilt/quilt-0.60.inc | 29 ++++++++++++++++++++++++ meta/recipes-devtools/quilt/quilt-native_0.51.bb | 4 ---- meta/recipes-devtools/quilt/quilt-native_0.60.bb | 4 ++++ meta/recipes-devtools/quilt/quilt_0.51.bb | 20 ---------------- meta/recipes-devtools/quilt/quilt_0.60.bb | 20 ++++++++++++++++ 6 files changed, 53 insertions(+), 53 deletions(-) delete mode 100644 meta/recipes-devtools/quilt/quilt-0.51.inc create mode 100644 meta/recipes-devtools/quilt/quilt-0.60.inc delete mode 100644 meta/recipes-devtools/quilt/quilt-native_0.51.bb create mode 100644 meta/recipes-devtools/quilt/quilt-native_0.60.bb delete mode 100644 meta/recipes-devtools/quilt/quilt_0.51.bb create mode 100644 meta/recipes-devtools/quilt/quilt_0.60.bb (limited to 'meta/recipes-devtools/quilt') diff --git a/meta/recipes-devtools/quilt/quilt-0.51.inc b/meta/recipes-devtools/quilt/quilt-0.51.inc deleted file mode 100644 index 824e624a43..0000000000 --- a/meta/recipes-devtools/quilt/quilt-0.51.inc +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Tool to work 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] = "d56d23d5212297d5777502e84dc0ee80" -SRC_URI[sha256sum] = "05441399d36399b3f26cb12e29c98a8ce4d1287d036957fa22408807860af614" - -inherit autotools - -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" - -# quilt ignores DESTDIR -do_install () { - oe_runmake 'BUILD_ROOT=${D}' install - # cleanup unpackaged files - rm -rf ${D}/${datadir}/emacs -} diff --git a/meta/recipes-devtools/quilt/quilt-0.60.inc b/meta/recipes-devtools/quilt/quilt-0.60.inc new file mode 100644 index 0000000000..1e240a0aad --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt-0.60.inc @@ -0,0 +1,29 @@ +DESCRIPTION = "Tool to work 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 + +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" + +# quilt ignores DESTDIR +do_install () { + oe_runmake 'BUILD_ROOT=${D}' install + # cleanup unpackaged files + rm -rf ${D}/${datadir}/emacs +} diff --git a/meta/recipes-devtools/quilt/quilt-native_0.51.bb b/meta/recipes-devtools/quilt/quilt-native_0.51.bb deleted file mode 100644 index 1494bf2eb4..0000000000 --- a/meta/recipes-devtools/quilt/quilt-native_0.51.bb +++ /dev/null @@ -1,4 +0,0 @@ -require quilt-${PV}.inc -require quilt-native.inc - -PR = "r1" diff --git a/meta/recipes-devtools/quilt/quilt-native_0.60.bb b/meta/recipes-devtools/quilt/quilt-native_0.60.bb new file mode 100644 index 0000000000..b99b9b65d2 --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt-native_0.60.bb @@ -0,0 +1,4 @@ +require quilt-${PV}.inc +require quilt-native.inc + +PR = "r0" diff --git a/meta/recipes-devtools/quilt/quilt_0.51.bb b/meta/recipes-devtools/quilt/quilt_0.51.bb deleted file mode 100644 index 4e51b49983..0000000000 --- a/meta/recipes-devtools/quilt/quilt_0.51.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 = "r4" - -PERLPATH = "${bindir}/env perl" -PERLPATH_virtclass-nativesdk = "/usr/bin/env perl" - -# 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,#! ${PERLPATH},' $perlscript - fi - done -} diff --git a/meta/recipes-devtools/quilt/quilt_0.60.bb b/meta/recipes-devtools/quilt/quilt_0.60.bb new file mode 100644 index 0000000000..b085daf927 --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt_0.60.bb @@ -0,0 +1,20 @@ +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 = "r0" + +PERLPATH = "${bindir}/env perl" +PERLPATH_virtclass-nativesdk = "/usr/bin/env perl" + +# 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,#! ${PERLPATH},' $perlscript + fi + done +} -- cgit v1.2.3-54-g00ecf