Patchwork [CONSOLIDATED,PULL,51/62] m4: refactor .bb and .inc files

login
mail settings
Submitter Saul Wold
Date Jan. 17, 2012, 8:32 a.m.
Message ID <a680d539593f57953b1a0f365047b4c9294783b9.1326786990.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/19553/
State Accepted
Commit 4677da625f8ceb02c96f365bb948b8901bd694a4
Headers show

Comments

Saul Wold - Jan. 17, 2012, 8:32 a.m.
The orignal had common code in the m4_1.4.16.bb file that was
in the m4.inc file. m4-native was then including the m4.bb file
and picking up the BBCLASSEXTEND, which causes the fetch to fail.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/m4/m4-native_1.4.16.bb |    3 ++-
 meta/recipes-devtools/m4/m4.inc              |   19 +++++++++++++++++++
 meta/recipes-devtools/m4/m4_1.4.16.bb        |   19 +------------------
 3 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 meta/recipes-devtools/m4/m4.inc

Patch

diff --git a/meta/recipes-devtools/m4/m4-native_1.4.16.bb b/meta/recipes-devtools/m4/m4-native_1.4.16.bb
index fa871b3..39ed4e8 100644
--- a/meta/recipes-devtools/m4/m4-native_1.4.16.bb
+++ b/meta/recipes-devtools/m4/m4-native_1.4.16.bb
@@ -1,4 +1,5 @@ 
-require m4_${PV}.bb
+require m4.inc
+
 inherit native
 
 INHIBIT_AUTOTOOLS_DEPS = "1"
diff --git a/meta/recipes-devtools/m4/m4.inc b/meta/recipes-devtools/m4/m4.inc
new file mode 100644
index 0000000..bc1dacb
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4.inc
@@ -0,0 +1,19 @@ 
+SUMMARY = "Traditional Unix macro processor"
+DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor.  It is mostly SVR4 \
+compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \
+GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
+	            file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d"
+
+PR = "r2"
+SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
+           file://ac_config_links.patch"
+
+SRC_URI[md5sum] = "a5dfb4f2b7370e9d34293d23fd09b280"
+SRC_URI[sha256sum] = "e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da"
+
+inherit autotools
+
+EXTRA_OEMAKE += "'infodir=${infodir}'"
+
diff --git a/meta/recipes-devtools/m4/m4_1.4.16.bb b/meta/recipes-devtools/m4/m4_1.4.16.bb
index 58b0491..bb4ca35 100644
--- a/meta/recipes-devtools/m4/m4_1.4.16.bb
+++ b/meta/recipes-devtools/m4/m4_1.4.16.bb
@@ -1,20 +1,3 @@ 
-SUMMARY = "Traditional Unix macro processor"
-DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor.  It is mostly SVR4 \
-compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \
-GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
-	file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d"
-
-PR = "r1"
-SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
-           file://ac_config_links.patch"
-
-SRC_URI[md5sum] = "a5dfb4f2b7370e9d34293d23fd09b280"
-SRC_URI[sha256sum] = "e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da"
-
-inherit autotools
-
-EXTRA_OEMAKE += "'infodir=${infodir}'"
+require m4.inc
 
 BBCLASSEXTEND = "nativesdk"