| Submitter | Nitin A Kamble |
|---|---|
| Date | Dec. 30, 2011, 12:30 a.m. |
| Message ID | <8c4e9e6f96af830d11f286577e2baf487231f14d.1325204775.git.nitin.a.kamble@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/17795/ |
| State | New |
| Headers | show |
Comments
On 12/29/2011 04:30 PM, nitin.a.kamble@intel.com wrote: > From: Nitin A Kamble<nitin.a.kamble@intel.com> > > 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. > There are some packaging warning for non-shipped items. The best solution may be to remove the directory & files (/usr/share/emacs/...) in a do_install_append(). Sau! > Signed-off-by: Nitin A Kamble<nitin.a.kamble@intel.com> > --- > .../quilt/{quilt.inc => quilt-0.50.inc} | 6 +++- > meta/recipes-devtools/quilt/quilt-native_0.48.bb | 7 ------ > meta/recipes-devtools/quilt/quilt-native_0.50.bb | 4 +++ > .../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 ++++++ > 6 files changed, 15 insertions(+), 43 deletions(-) > rename meta/recipes-devtools/quilt/{quilt.inc => quilt-0.50.inc} (82%) > 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/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 > > diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt-0.50.inc > similarity index 82% > rename from meta/recipes-devtools/quilt/quilt.inc > rename to meta/recipes-devtools/quilt/quilt-0.50.inc > index 3a66093..9ba98f8 100644 > --- a/meta/recipes-devtools/quilt/quilt.inc > +++ b/meta/recipes-devtools/quilt/quilt-0.50.inc > @@ -5,8 +5,10 @@ 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 > > 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 a62531e..0000000 > --- 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 0000000..b99b9b6 > --- /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 348b327..0000000 > --- 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 1600c62..0000000 > --- 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 0000000..6691d15 > --- /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"
Patch
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt-0.50.inc similarity index 82% rename from meta/recipes-devtools/quilt/quilt.inc rename to meta/recipes-devtools/quilt/quilt-0.50.inc index 3a66093..9ba98f8 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt-0.50.inc @@ -5,8 +5,10 @@ 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 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 a62531e..0000000 --- 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 0000000..b99b9b6 --- /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 348b327..0000000 --- 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 1600c62..0000000 --- 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 0000000..6691d15 --- /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"