util-macros: convert to BBCLASSEXTEND, add version 1.6.1

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

16 files changed, 26 insertions, 98 deletions

diff --git a/recipes/xorg-util/util-macros-native_1.1.5.bb b/recipes/xorg-util/util-macros-native_1.1.5.bb
deleted file mode 100644
index c327f3f54e..0000000000
--- a/recipes/xorg-util/util-macros-native_1.1.5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require util-macros_${PV}.bb
-
-inherit native
-
-PR = "r1"
-
-XORG_PN = "util-macros"
-
-S = "${WORKDIR}/util-macros-1.1.5"
diff --git a/recipes/xorg-util/util-macros-native_1.1.6.bb b/recipes/xorg-util/util-macros-native_1.1.6.bb
deleted file mode 100644
index 618e78f116..0000000000
--- a/recipes/xorg-util/util-macros-native_1.1.6.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require util-macros_${PV}.bb
-
-inherit native
-
-XORG_PN = "util-macros"
-
-S = "${WORKDIR}/util-macros-${PV}"
diff --git a/recipes/xorg-util/util-macros-native_1.2.1.bb b/recipes/xorg-util/util-macros-native_1.2.1.bb
deleted file mode 100644
index 618e78f116..0000000000
--- a/recipes/xorg-util/util-macros-native_1.2.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require util-macros_${PV}.bb
-
-inherit native
-
-XORG_PN = "util-macros"
-
-S = "${WORKDIR}/util-macros-${PV}"
diff --git a/recipes/xorg-util/util-macros-native_1.3.0.bb b/recipes/xorg-util/util-macros-native_1.3.0.bb
deleted file mode 100644
index 618e78f116..0000000000
--- a/recipes/xorg-util/util-macros-native_1.3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require util-macros_${PV}.bb
-
-inherit native
-
-XORG_PN = "util-macros"
-
-S = "${WORKDIR}/util-macros-${PV}"
diff --git a/recipes/xorg-util/util-macros-native_1.4.1.bb b/recipes/xorg-util/util-macros-native_1.4.1.bb
deleted file mode 100644
index 618e78f116..0000000000
--- a/recipes/xorg-util/util-macros-native_1.4.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require util-macros_${PV}.bb
-
-inherit native
-
-XORG_PN = "util-macros"
-
-S = "${WORKDIR}/util-macros-${PV}"
diff --git a/recipes/xorg-util/util-macros-native_1.5.0.bb b/recipes/xorg-util/util-macros-native_1.5.0.bb
deleted file mode 100644
index 618e78f116..0000000000
--- a/recipes/xorg-util/util-macros-native_1.5.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require util-macros_${PV}.bb
-
-inherit native
-
-XORG_PN = "util-macros"
-
-S = "${WORKDIR}/util-macros-${PV}"
diff --git a/recipes/xorg-util/util-macros-native_1.6.0.bb b/recipes/xorg-util/util-macros-native_1.6.0.bb
deleted file mode 100644
index 618e78f116..0000000000
--- a/recipes/xorg-util/util-macros-native_1.6.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require util-macros_${PV}.bb
-
-inherit native
-
-XORG_PN = "util-macros"
-
-S = "${WORKDIR}/util-macros-${PV}"
diff --git a/recipes/xorg-util/util-macros.inc b/recipes/xorg-util/util-macros.inc
new file mode 100644
index 0000000000..9af52172f3
--- /dev/null
+++ b/recipes/xorg-util/util-macros.inc
@@ -0,0 +1,8 @@
+require xorg-util-common.inc
+
+DESCRIPTION = "X autotools macros"
+INC_PR = "r2"
+PE = "1"
+
+ALLOW_EMPTY = "1"
+BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-util/util-macros_1.1.5.bb b/recipes/xorg-util/util-macros_1.1.5.bb
index 46fc0a8d19..e67c9ef730 100644
--- a/recipes/xorg-util/util-macros_1.1.5.bb
+++ b/recipes/xorg-util/util-macros_1.1.5.bb
@@ -1,9 +1,3 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "X autotools macros"
-PR = "r1"
-PE = "1"
-
-ALLOW_EMPTY = "1"
-
+require util-macros.inc
 SRC_URI += "file://unbreak_cross_compile.patch;patch=1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-util/util-macros_1.1.6.bb b/recipes/xorg-util/util-macros_1.1.6.bb
index 4775fc6901..252a5cd10c 100644
--- a/recipes/xorg-util/util-macros_1.1.6.bb
+++ b/recipes/xorg-util/util-macros_1.1.6.bb
@@ -1,6 +1,2 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "X autotools macros"
-PE = "1"
-
-ALLOW_EMPTY = "1"
+require util-macros.inc
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-util/util-macros_1.2.1.bb b/recipes/xorg-util/util-macros_1.2.1.bb
index ddf8874a3b..2ff2e95d91 100644
--- a/recipes/xorg-util/util-macros_1.2.1.bb
+++ b/recipes/xorg-util/util-macros_1.2.1.bb
@@ -1,12 +1,8 @@
-require xorg-util-common.inc
+require util-macros.inc
 
 # Version 1.2.1 uses plain `gcc' for checking the compiler version.
 # Instead, the cross compiler must be used. Whenever upgrading to
 # a new version, please recheck for this problem, otherwise it breaks
 # builds with older gcc versions!
 SRC_URI += " file://cross-compiler-for-checking.patch;patch=1"
-
-DESCRIPTION = "X autotools macros"
-PE = "1"
-
-ALLOW_EMPTY = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-util/util-macros_1.3.0.bb b/recipes/xorg-util/util-macros_1.3.0.bb
index 4775fc6901..252a5cd10c 100644
--- a/recipes/xorg-util/util-macros_1.3.0.bb
+++ b/recipes/xorg-util/util-macros_1.3.0.bb
@@ -1,6 +1,2 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "X autotools macros"
-PE = "1"
-
-ALLOW_EMPTY = "1"
+require util-macros.inc
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-util/util-macros_1.4.1.bb b/recipes/xorg-util/util-macros_1.4.1.bb
index 7e0b7d5cc9..3253d2b5a3 100644
--- a/recipes/xorg-util/util-macros_1.4.1.bb
+++ b/recipes/xorg-util/util-macros_1.4.1.bb
@@ -1,8 +1,3 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "X autotools macros"
-PE = "1"
-
+require util-macros.inc
 SRC_URI += " file://malloc_zero_returns_null.patch;patch=1"
-
-ALLOW_EMPTY = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-util/util-macros_1.5.0.bb b/recipes/xorg-util/util-macros_1.5.0.bb
index 4775fc6901..252a5cd10c 100644
--- a/recipes/xorg-util/util-macros_1.5.0.bb
+++ b/recipes/xorg-util/util-macros_1.5.0.bb
@@ -1,6 +1,2 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "X autotools macros"
-PE = "1"
-
-ALLOW_EMPTY = "1"
+require util-macros.inc
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-util/util-macros_1.6.0.bb b/recipes/xorg-util/util-macros_1.6.0.bb
index 0fb42dc55f..c5a715f7be 100644
--- a/recipes/xorg-util/util-macros_1.6.0.bb
+++ b/recipes/xorg-util/util-macros_1.6.0.bb
@@ -1,10 +1,4 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "X autotools macros"
-PR = "r1"
-PE = "1"
-
-ALLOW_EMPTY = "1"
-
+require util-macros.inc
 SRC_URI[archive.md5sum] = "eb991c709781f811fbfcdbd43f9edd16"
 SRC_URI[archive.sha256sum] = "12c7a8819f2df62ff7fca20152438d6b4e93ac581d7de211e31149739aa37ce9"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-util/util-macros_1.6.1.bb b/recipes/xorg-util/util-macros_1.6.1.bb
new file mode 100644
index 0000000000..80c59713ed
--- /dev/null
+++ b/recipes/xorg-util/util-macros_1.6.1.bb
@@ -0,0 +1,4 @@
+require util-macros.inc
+SRC_URI[archive.md5sum] = "a4bef59dd4a2e3450c07c77c6b45a79f"
+SRC_URI[archive.sha256sum] = "ba91652d78f2a63d69253fb80af2f0a76c2e1b081c64521f90fac3866ee893d7"
+PR = "${INC_PR}.0"