From 99e4a9ad7999bf63bac289d7fa4dc64f104e85ba Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Tue, 27 Dec 2011 11:19:14 -0800 Subject: quilt upgreade from 0.48 to 0.50 gnu_patch_test_fix.patch : this patch removed as it is already upstream now. Renamed quilt.inc to quilt-0.50.inc and moved the dupicate information from native & target recipe files into the quilt-0.50.inc file. Clean up the unpackaged files warning These warnings are avoided: WARNING: For recipe quilt, the following files/directories were installed but not shipped in any package: WARNING: /usr/bin/quiltrc WARNING: /usr/share/emacs WARNING: /usr/share/emacs/site-lisp WARNING: /usr/share/emacs/site-lisp/quilt.el The /usr/bin/quiltrc is purposely not packaged, as it is needed for native recipe only. (From OE-Core rev: ffb10e51dae3e360822f26d1425c3327213a7e81) Signed-off-by: Nitin A Kamble Signed-off-by: Richard Purdie --- meta/recipes-devtools/quilt/quilt-0.50.inc | 34 ++++++++++++++++++++++ meta/recipes-devtools/quilt/quilt-native_0.48.bb | 7 ----- meta/recipes-devtools/quilt/quilt-native_0.50.bb | 4 +++ meta/recipes-devtools/quilt/quilt.inc | 30 ------------------- .../quilt/quilt/gnu_patch_test_fix.patch | 21 ------------- meta/recipes-devtools/quilt/quilt_0.48.bb | 13 --------- meta/recipes-devtools/quilt/quilt_0.50.bb | 7 +++++ 7 files changed, 45 insertions(+), 71 deletions(-) create mode 100644 meta/recipes-devtools/quilt/quilt-0.50.inc delete mode 100644 meta/recipes-devtools/quilt/quilt-native_0.48.bb create mode 100644 meta/recipes-devtools/quilt/quilt-native_0.50.bb delete mode 100644 meta/recipes-devtools/quilt/quilt.inc delete mode 100644 meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix.patch delete mode 100644 meta/recipes-devtools/quilt/quilt_0.48.bb create mode 100644 meta/recipes-devtools/quilt/quilt_0.50.bb (limited to 'meta/recipes-devtools/quilt') diff --git a/meta/recipes-devtools/quilt/quilt-0.50.inc b/meta/recipes-devtools/quilt/quilt-0.50.inc new file mode 100644 index 0000000000..5a72169f9b --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt-0.50.inc @@ -0,0 +1,34 @@ +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] = "ff5e1e041363c3af3c8fda4b968c9d1d" +SRC_URI[sha256sum] = "fa4579628a98cf94472b36869e74f5cd0cb057d6fd13c1872a53f01c45aba8c3" + +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}/${P}" +FILES_guards-doc = "${mandir}/man1/guards.1" + +RDEPENDS_${PN} = "bash" + +# quilt ignores DESTDIR +do_install () { + oe_runmake 'BUILD_ROOT=${D}' install + if [ "${BUILD_ARCH}" == "${HOST_ARCH}" ]; then + # Dummy quiltrc file for patch.bbclass + install -d ${D}${bindir}/ + touch ${D}${bindir}/quiltrc + fi + # cleanup unpackaged files + rm -rf ${D}/${datadir}/emacs +} diff --git a/meta/recipes-devtools/quilt/quilt-native_0.48.bb b/meta/recipes-devtools/quilt/quilt-native_0.48.bb deleted file mode 100644 index a62531e39d..0000000000 --- a/meta/recipes-devtools/quilt/quilt-native_0.48.bb +++ /dev/null @@ -1,7 +0,0 @@ -require quilt.inc -require quilt-native.inc - -PR = "r0" - -SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b" -SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc" diff --git a/meta/recipes-devtools/quilt/quilt-native_0.50.bb b/meta/recipes-devtools/quilt/quilt-native_0.50.bb new file mode 100644 index 0000000000..b99b9b65d2 --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt-native_0.50.bb @@ -0,0 +1,4 @@ +require quilt-${PV}.inc +require quilt-native.inc + +PR = "r0" diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc deleted file mode 100644 index 3a6609378b..0000000000 --- a/meta/recipes-devtools/quilt/quilt.inc +++ /dev/null @@ -1,30 +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 \ - file://gnu_patch_test_fix.patch" - -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}/${P}" -FILES_guards-doc = "${mandir}/man1/guards.1" - -RDEPENDS_${PN} = "bash" - -# quilt ignores DESTDIR -do_install () { - oe_runmake 'BUILD_ROOT=${D}' install - if [ "${BUILD_ARCH}" == "${HOST_ARCH}" ]; then - # Dummy quiltrc file for patch.bbclass - install -d ${D}${bindir}/ - touch ${D}${bindir}/quiltrc - fi -} diff --git a/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix.patch b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix.patch deleted file mode 100644 index 348b327e9b..0000000000 --- a/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -Upstream-Status: Pending - -# quilt's configure tosses an error with patch @ GNU patch 2.6.1.81-5b68 -# -# Signed-off-by: Elizabeth Flanagan ---- quilt-0.48/configure 2010-11-03 11:50:55.280329802 -0700 -+++ quilt-0.48/configure 2010-11-03 11:52:43.705354080 -0700 -@@ -5896,7 +5896,12 @@ - echo $ECHO_N "checking the version of $PATCH... $ECHO_C" >&6; } - if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then - set -- `$PATCH --version 2> /dev/null` -- patch_version=$2 -+ # -+ if test x$1 = xGNU ; then -+ patch_version=$3 -+ else -+ patch_version=$2 -+ fi - { echo "$as_me:$LINENO: result: $patch_version" >&5 - echo "${ECHO_T}$patch_version" >&6; } - saved_IFS=$IFS; IFS='.' diff --git a/meta/recipes-devtools/quilt/quilt_0.48.bb b/meta/recipes-devtools/quilt/quilt_0.48.bb deleted file mode 100644 index 1600c623b0..0000000000 --- a/meta/recipes-devtools/quilt/quilt_0.48.bb +++ /dev/null @@ -1,13 +0,0 @@ -require quilt.inc -LICENSE="GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" -PR = "r2" -SRC_URI += "file://aclocal.patch \ - file://gnu_patch_test_fix_target.patch \ - " - -SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b" -SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc" - -inherit autotools gettext diff --git a/meta/recipes-devtools/quilt/quilt_0.50.bb b/meta/recipes-devtools/quilt/quilt_0.50.bb new file mode 100644 index 0000000000..6691d1519c --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt_0.50.bb @@ -0,0 +1,7 @@ +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" -- cgit v1.2.3-54-g00ecf