summaryrefslogtreecommitdiff
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:10:51 +0000
commitffb10e51dae3e360822f26d1425c3327213a7e81 (patch)
tree6f79bcb458e4e0961536558f990edbe01262f0d5
parent275d61ce0f6e1f0613eb31beb6878c97306666f5 (diff)
downloadopenembedded-core-ffb10e51dae3e360822f26d1425c3327213a7e81.tar.gz
openembedded-core-ffb10e51dae3e360822f26d1425c3327213a7e81.tar.bz2
openembedded-core-ffb10e51dae3e360822f26d1425c3327213a7e81.tar.xz
openembedded-core-ffb10e51dae3e360822f26d1425c3327213a7e81.zip
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. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
-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 3a6609378..5a72169f9 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt-0.50.inc
@@ -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
}
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 a62531e39..000000000
--- 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 000000000..b99b9b65d
--- /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/gnu_patch_test_fix.patch b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix.patch
deleted file mode 100644
index 348b327e9..000000000
--- 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 <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='.'
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 1600c623b..000000000
--- 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 000000000..6691d1519
--- /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"