diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/quilt/quilt-native_0.48.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/quilt/quilt.inc | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/quilt/quilt/patch-version-detection.patch | 29 | ||||
-rw-r--r-- | meta/recipes-devtools/quilt/quilt_0.48.bb | 2 |
4 files changed, 3 insertions, 33 deletions
diff --git a/meta/recipes-devtools/quilt/quilt-native_0.48.bb b/meta/recipes-devtools/quilt/quilt-native_0.48.bb index 3cfe3959c5..a62531e39d 100644 --- a/meta/recipes-devtools/quilt/quilt-native_0.48.bb +++ b/meta/recipes-devtools/quilt/quilt-native_0.48.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require quilt.inc | 1 | require quilt.inc |
2 | require quilt-native.inc | 2 | require quilt-native.inc |
3 | 3 | ||
4 | PR = "r1" | 4 | PR = "r0" |
5 | 5 | ||
6 | SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b" | 6 | SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b" |
7 | SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc" | 7 | SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc" |
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index e2cfce4a06..45425116af 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc | |||
@@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | |||
6 | 6 | ||
7 | SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \ | 7 | SRC_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 | file://gnu_patch_test_fix.patch" |
10 | file://patch-version-detection.patch" | ||
11 | 10 | ||
12 | inherit autotools | 11 | inherit autotools |
13 | 12 | ||
diff --git a/meta/recipes-devtools/quilt/quilt/patch-version-detection.patch b/meta/recipes-devtools/quilt/quilt/patch-version-detection.patch deleted file mode 100644 index 8b84f812b5..0000000000 --- a/meta/recipes-devtools/quilt/quilt/patch-version-detection.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From: Jean Delvare | ||
2 | Subject: [Quilt-dev] [PACH] Fix patch version detection | ||
3 | Date: Mon, 21 Jun 2010 13:49:50 +0200 | ||
4 | |||
5 | New versions of GNU patch present themselves as "GNU patch" instead | ||
6 | of just "patch". | ||
7 | --- | ||
8 | configure.ac | 6 +++++- | ||
9 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
10 | |||
11 | --- a/configure.ac | ||
12 | +++ b/configure.ac | ||
13 | @@ -262,7 +262,11 @@ fi | ||
14 | AC_MSG_CHECKING([the version of $PATCH]) | ||
15 | if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then | ||
16 | set -- `$PATCH --version 2> /dev/null` | ||
17 | - patch_version=$2 | ||
18 | + if test x$1 = xGNU ; then | ||
19 | + patch_version=$3 | ||
20 | + else | ||
21 | + patch_version=$2 | ||
22 | + fi | ||
23 | AC_MSG_RESULT($patch_version) | ||
24 | saved_IFS=$IFS; IFS='.' | ||
25 | set -- $patch_version | ||
26 | |||
27 | -- | ||
28 | Jean Delvare | ||
29 | Suse L3 | ||
diff --git a/meta/recipes-devtools/quilt/quilt_0.48.bb b/meta/recipes-devtools/quilt/quilt_0.48.bb index 6f5e2bc10f..a2a8a5ce34 100644 --- a/meta/recipes-devtools/quilt/quilt_0.48.bb +++ b/meta/recipes-devtools/quilt/quilt_0.48.bb | |||
@@ -2,7 +2,7 @@ require quilt.inc | |||
2 | LICENSE="GPLv2" | 2 | LICENSE="GPLv2" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
4 | RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" | 4 | RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" |
5 | PR = "r1" | 5 | PR = "r0" |
6 | SRC_URI += "file://aclocal.patch" | 6 | SRC_URI += "file://aclocal.patch" |
7 | 7 | ||
8 | SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b" | 8 | SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b" |