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 <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Nitin A Kamble 2011-12-27 11:19:14 -08:00 committed by Richard Purdie
parent d3609d0b64
commit 99e4a9ad79
6 changed files with 18 additions and 44 deletions

View File

@ -5,14 +5,16 @@ 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"
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"
${bindir}/quilt ${libdir}/quilt"
FILES_guards = "${bindir}/guards"
FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${P}"
FILES_guards-doc = "${mandir}/man1/guards.1"
@ -27,4 +29,6 @@ do_install () {
install -d ${D}${bindir}/
touch ${D}${bindir}/quiltrc
fi
# cleanup unpackaged files
rm -rf ${D}/${datadir}/emacs
}

View File

@ -1,7 +0,0 @@
require quilt.inc
require quilt-native.inc
PR = "r0"
SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"

View File

@ -0,0 +1,4 @@
require quilt-${PV}.inc
require quilt-native.inc
PR = "r0"

View File

@ -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 <elizabeth.flanagan@intel.com>
--- 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='.'

View File

@ -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

View File

@ -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"