From 31c0e3df13151307c34d40c5c746f55c5e068127 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Tue, 22 Jun 2010 02:39:19 -0700 Subject: [PATCH] quilt: upgrade from 0.47 to 0.48 Also update metadata variables like LICENSE & LIC_CHKSUM_FILES Signed-off-by: Nitin A Kamble --- meta/packages/quilt/quilt-native.inc | 2 +- meta/packages/quilt/quilt-native_0.47.bb | 4 ---- meta/packages/quilt/quilt-native_0.48.bb | 4 ++++ meta/packages/quilt/quilt.inc | 6 ++++-- meta/packages/quilt/{quilt-0.47 => quilt}/aclocal.patch | 0 meta/packages/quilt/{quilt-0.47 => quilt}/install.patch | 0 meta/packages/quilt/{quilt-0.47 => quilt}/non-gnu.patch | 0 meta/packages/quilt/quilt_0.47.bb | 7 ------- meta/packages/quilt/quilt_0.47.inc | 3 --- meta/packages/quilt/quilt_0.48.bb | 7 +++++++ 10 files changed, 16 insertions(+), 17 deletions(-) delete mode 100644 meta/packages/quilt/quilt-native_0.47.bb create mode 100644 meta/packages/quilt/quilt-native_0.48.bb rename meta/packages/quilt/{quilt-0.47 => quilt}/aclocal.patch (100%) rename meta/packages/quilt/{quilt-0.47 => quilt}/install.patch (100%) rename meta/packages/quilt/{quilt-0.47 => quilt}/non-gnu.patch (100%) delete mode 100644 meta/packages/quilt/quilt_0.47.bb delete mode 100644 meta/packages/quilt/quilt_0.47.inc create mode 100644 meta/packages/quilt/quilt_0.48.bb diff --git a/meta/packages/quilt/quilt-native.inc b/meta/packages/quilt/quilt-native.inc index 0eeaa87e1c..7efea0213d 100644 --- a/meta/packages/quilt/quilt-native.inc +++ b/meta/packages/quilt/quilt-native.inc @@ -1,4 +1,4 @@ -SRC_URI_append_build-darwin = "? file://non-gnu.patch;patch=1 " +SRC_URI_append_build-darwin = "? file://non-gnu.patch " RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native util-linux-native" INHIBIT_AUTOTOOLS_DEPS = "1" diff --git a/meta/packages/quilt/quilt-native_0.47.bb b/meta/packages/quilt/quilt-native_0.47.bb deleted file mode 100644 index b6fefce9cc..0000000000 --- a/meta/packages/quilt/quilt-native_0.47.bb +++ /dev/null @@ -1,4 +0,0 @@ -require quilt_${PV}.inc -require quilt-native.inc - -PR = "r2" \ No newline at end of file diff --git a/meta/packages/quilt/quilt-native_0.48.bb b/meta/packages/quilt/quilt-native_0.48.bb new file mode 100644 index 0000000000..d1dd57619a --- /dev/null +++ b/meta/packages/quilt/quilt-native_0.48.bb @@ -0,0 +1,4 @@ +require quilt.inc +require quilt-native.inc + +PR = "r0" diff --git a/meta/packages/quilt/quilt.inc b/meta/packages/quilt/quilt.inc index 944990cd95..e5e0a4feca 100644 --- a/meta/packages/quilt/quilt.inc +++ b/meta/packages/quilt/quilt.inc @@ -1,9 +1,11 @@ DESCRIPTION = "Tool to work with series of patches." HOMEPAGE = "http://savannah.nongnu.org/projects/quilt/" SECTION = "devel" -LICENSE = "GPL" +LICENSE = "GPLv2" +LIC_CHKSUM_FILES = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz " +SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \ + file://install.patch" inherit autotools diff --git a/meta/packages/quilt/quilt-0.47/aclocal.patch b/meta/packages/quilt/quilt/aclocal.patch similarity index 100% rename from meta/packages/quilt/quilt-0.47/aclocal.patch rename to meta/packages/quilt/quilt/aclocal.patch diff --git a/meta/packages/quilt/quilt-0.47/install.patch b/meta/packages/quilt/quilt/install.patch similarity index 100% rename from meta/packages/quilt/quilt-0.47/install.patch rename to meta/packages/quilt/quilt/install.patch diff --git a/meta/packages/quilt/quilt-0.47/non-gnu.patch b/meta/packages/quilt/quilt/non-gnu.patch similarity index 100% rename from meta/packages/quilt/quilt-0.47/non-gnu.patch rename to meta/packages/quilt/quilt/non-gnu.patch diff --git a/meta/packages/quilt/quilt_0.47.bb b/meta/packages/quilt/quilt_0.47.bb deleted file mode 100644 index 67524316d8..0000000000 --- a/meta/packages/quilt/quilt_0.47.bb +++ /dev/null @@ -1,7 +0,0 @@ -require quilt_${PV}.inc - -RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" -SRC_URI += "file://aclocal.patch;patch=1" -PR = "r1" - -inherit gettext diff --git a/meta/packages/quilt/quilt_0.47.inc b/meta/packages/quilt/quilt_0.47.inc deleted file mode 100644 index bf6267b56c..0000000000 --- a/meta/packages/quilt/quilt_0.47.inc +++ /dev/null @@ -1,3 +0,0 @@ -require quilt.inc - -SRC_URI += "file://install.patch;patch=1" diff --git a/meta/packages/quilt/quilt_0.48.bb b/meta/packages/quilt/quilt_0.48.bb new file mode 100644 index 0000000000..5db67b24a1 --- /dev/null +++ b/meta/packages/quilt/quilt_0.48.bb @@ -0,0 +1,7 @@ +require quilt.inc + +RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" +PR = "r0" +SRC_URI += "file://aclocal.patch" + +inherit gettext