From b6faf3681a61ede4d806ce0465f953d600e388e8 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Date: Mon, 1 Mar 2010 12:36:31 +0100
Subject: autoconf: merged Poky changes (BBEXTENDCLASS + new staging)
Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
---
recipes/automake/automake-native.inc | 11 -----------
recipes/automake/automake-native_1.10.2.bb | 3 ---
recipes/automake/automake-native_1.11.1.bb | 5 -----
recipes/automake/automake-native_1.9.6.bb | 3 ---
recipes/automake/automake.inc | 6 +++++-
5 files changed, 5 insertions(+), 23 deletions(-)
delete mode 100644 recipes/automake/automake-native.inc
delete mode 100644 recipes/automake/automake-native_1.10.2.bb
delete mode 100644 recipes/automake/automake-native_1.11.1.bb
delete mode 100644 recipes/automake/automake-native_1.9.6.bb
(limited to 'recipes/automake')
diff --git a/recipes/automake/automake-native.inc b/recipes/automake/automake-native.inc
deleted file mode 100644
index 4e2ac41d81..0000000000
--- a/recipes/automake/automake-native.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SECTION = "devel"
-require automake_${PV}.bb
-DEPENDS += "autoconf-native"
-RDEPENDS_automake-native += "autoconf-native perl-native-runtime"
-
-inherit native
-
-do_stage () {
- oe_runmake install
- install -d ${datadir}/aclocal
-}
diff --git a/recipes/automake/automake-native_1.10.2.bb b/recipes/automake/automake-native_1.10.2.bb
deleted file mode 100644
index 92c861f49c..0000000000
--- a/recipes/automake/automake-native_1.10.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-PV := "${PV}"
-
-require automake-native.inc
diff --git a/recipes/automake/automake-native_1.11.1.bb b/recipes/automake/automake-native_1.11.1.bb
deleted file mode 100644
index a7857c562d..0000000000
--- a/recipes/automake/automake-native_1.11.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-PV := "${PV}"
-
-require automake-native.inc
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/automake/automake-native_1.9.6.bb b/recipes/automake/automake-native_1.9.6.bb
deleted file mode 100644
index 92c861f49c..0000000000
--- a/recipes/automake/automake-native_1.9.6.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-PV := "${PV}"
-
-require automake-native.inc
diff --git a/recipes/automake/automake.inc b/recipes/automake/automake.inc
index 74957cc9e9..662f9f8722 100644
--- a/recipes/automake/automake.inc
+++ b/recipes/automake/automake.inc
@@ -2,6 +2,8 @@ DESCRIPTION = "A tool for automatically generating Makefiles."
LICENSE = "GPL"
HOMEPAGE = "http://www.gnu.org/software/automake/"
SECTION = "devel"
+DEPENDS_virtclass-native = "autoconf-native"
+RDEPENDS_automake-native = "autoconf-native perl-native-runtime"
RDEPENDS_automake += "\
autoconf \
perl \
@@ -27,7 +29,7 @@ RDEPENDS_automake += "\
perl-module-text-parsewords \
perl-module-vars "
SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2"
-INC_PR = "r2"
+INC_PR = "r3"
AUTOMAKE_API = "${@".".join(bb.data.getVar("PV",d,1).split(".")[0:2])}"
inherit autotools
@@ -47,3 +49,5 @@ do_install_append () {
ln -sf automake-${AUTOMAKE_API} ${D}${bindir}/automake
install -d ${D}${datadir}/aclocal
}
+
+BBCLASSEXTEND = "native"
--
cgit v1.2.3
From 1f4479554dbe426d0ffe6453ba80e67708e971d7 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 18 Mar 2010 20:55:18 +0000
Subject: automake_1.10.3.bb : add latest version of 1.10.X branch.
This fixes CVE-2009-4029
---
recipes/automake/automake.inc | 2 +-
recipes/automake/automake_1.10.3.bb | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 recipes/automake/automake_1.10.3.bb
(limited to 'recipes/automake')
diff --git a/recipes/automake/automake.inc b/recipes/automake/automake.inc
index 662f9f8722..e378c048dc 100644
--- a/recipes/automake/automake.inc
+++ b/recipes/automake/automake.inc
@@ -28,7 +28,7 @@ RDEPENDS_automake += "\
perl-module-strict \
perl-module-text-parsewords \
perl-module-vars "
-SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2"
+SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2;name=automake"
INC_PR = "r3"
AUTOMAKE_API = "${@".".join(bb.data.getVar("PV",d,1).split(".")[0:2])}"
diff --git a/recipes/automake/automake_1.10.3.bb b/recipes/automake/automake_1.10.3.bb
new file mode 100644
index 0000000000..663333a51f
--- /dev/null
+++ b/recipes/automake/automake_1.10.3.bb
@@ -0,0 +1,6 @@
+require automake.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[automake.md5sum] = "b8e67fb458da396bc35555af7ef2b49f"
+SRC_URI[automake.sha256sum] = "e98ab43bb839c31696a4202e5b6ff388b391659ef2387cf9365019fad17e1adc"
+
--
cgit v1.2.3