summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/quilt
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-12-27 11:19:14 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:40 +0000
commit99e4a9ad7999bf63bac289d7fa4dc64f104e85ba (patch)
tree98491e8c77025c0bdd3428955e9edf48f41de2f5 /meta/recipes-devtools/quilt
parentd3609d0b6456c32310f4d7d0b129f591eb8f0d8e (diff)
downloadpoky-99e4a9ad7999bf63bac289d7fa4dc64f104e85ba.tar.gz
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>
Diffstat (limited to 'meta/recipes-devtools/quilt')
-rw-r--r--meta/recipes-devtools/quilt/quilt-0.50.inc (renamed from meta/recipes-devtools/quilt/quilt.inc)10
-rw-r--r--meta/recipes-devtools/quilt/quilt-native_0.48.bb7
-rw-r--r--meta/recipes-devtools/quilt/quilt-native_0.50.bb4
-rw-r--r--meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix.patch21
-rw-r--r--meta/recipes-devtools/quilt/quilt_0.48.bb13
-rw-r--r--meta/recipes-devtools/quilt/quilt_0.50.bb7
6 files changed, 18 insertions, 44 deletions
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt-0.50.inc
index 3a6609378b..5a72169f9b 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt-0.50.inc
@@ -5,14 +5,16 @@ LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
6 6
7SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \ 7SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \
8 file://install.patch \ 8 file://install.patch"
9 file://gnu_patch_test_fix.patch" 9
10SRC_URI[md5sum] = "ff5e1e041363c3af3c8fda4b968c9d1d"
11SRC_URI[sha256sum] = "fa4579628a98cf94472b36869e74f5cd0cb057d6fd13c1872a53f01c45aba8c3"
10 12
11inherit autotools 13inherit autotools
12 14
13PACKAGES += "guards guards-doc" 15PACKAGES += "guards guards-doc"
14FILES_${PN} = "${sysconfdir} ${datadir}/quilt \ 16FILES_${PN} = "${sysconfdir} ${datadir}/quilt \
15 ${bindir}/quilt ${libdir}/quilt" 17 ${bindir}/quilt ${libdir}/quilt"
16FILES_guards = "${bindir}/guards" 18FILES_guards = "${bindir}/guards"
17FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${P}" 19FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${P}"
18FILES_guards-doc = "${mandir}/man1/guards.1" 20FILES_guards-doc = "${mandir}/man1/guards.1"
@@ -27,4 +29,6 @@ do_install () {
27 install -d ${D}${bindir}/ 29 install -d ${D}${bindir}/
28 touch ${D}${bindir}/quiltrc 30 touch ${D}${bindir}/quiltrc
29 fi 31 fi
32 # cleanup unpackaged files
33 rm -rf ${D}/${datadir}/emacs
30} 34}
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 @@
1require quilt.inc
2require quilt-native.inc
3
4PR = "r0"
5
6SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
7SRC_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 @@
1require quilt-${PV}.inc
2require quilt-native.inc
3
4PR = "r0"
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 @@
1Upstream-Status: Pending
2
3# quilt's configure tosses an error with patch @ GNU patch 2.6.1.81-5b68
4#
5# Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
6--- quilt-0.48/configure 2010-11-03 11:50:55.280329802 -0700
7+++ quilt-0.48/configure 2010-11-03 11:52:43.705354080 -0700
8@@ -5896,7 +5896,12 @@
9 echo $ECHO_N "checking the version of $PATCH... $ECHO_C" >&6; }
10 if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then
11 set -- `$PATCH --version 2> /dev/null`
12- patch_version=$2
13+ #
14+ if test x$1 = xGNU ; then
15+ patch_version=$3
16+ else
17+ patch_version=$2
18+ fi
19 { echo "$as_me:$LINENO: result: $patch_version" >&5
20 echo "${ECHO_T}$patch_version" >&6; }
21 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 @@
1require quilt.inc
2LICENSE="GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
4RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
5PR = "r2"
6SRC_URI += "file://aclocal.patch \
7 file://gnu_patch_test_fix_target.patch \
8 "
9
10SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
11SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"
12
13inherit 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 @@
1require quilt-${PV}.inc
2inherit gettext
3RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
4SRC_URI += "file://aclocal.patch \
5 file://gnu_patch_test_fix_target.patch \
6 "
7PR = "r0"