summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/xorg-util/gccmakedep_1.0.2.bb (renamed from meta/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb)1
-rw-r--r--meta/packages/xorg-util/imake_1.0.2.bb (renamed from meta/packages/xorg-util/imake_X11R7.1-1.0.2.bb)1
-rw-r--r--meta/packages/xorg-util/lndir_1.0.1.bb (renamed from meta/packages/xorg-util/lndir_X11R7.0-1.0.1.bb)1
-rw-r--r--meta/packages/xorg-util/makedepend-native_1.0.0.bb (renamed from meta/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb)5
-rw-r--r--meta/packages/xorg-util/makedepend_1.0.0.bb (renamed from meta/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb)1
-rw-r--r--meta/packages/xorg-util/util-macros-native_1.1.5.bb (renamed from meta/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb)1
-rw-r--r--meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb9
-rw-r--r--meta/packages/xorg-util/util-macros_1.1.5.bb (renamed from meta/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb)2
-rw-r--r--meta/packages/xorg-util/xorg-cf-files_1.0.2.bb (renamed from meta/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb)1
-rw-r--r--meta/packages/xorg-util/xorg-util-common.inc3
10 files changed, 12 insertions, 13 deletions
diff --git a/meta/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/gccmakedep_1.0.2.bb
index f9dc1f3d3e..e943b70aa5 100644
--- a/meta/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb
+++ b/meta/packages/xorg-util/gccmakedep_1.0.2.bb
@@ -4,3 +4,4 @@ require xorg-util-common.inc
4 4
5#DEPENDS += " " 5#DEPENDS += " "
6 6
7PE = "1"
diff --git a/meta/packages/xorg-util/imake_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/imake_1.0.2.bb
index b2b11cf038..62611cc899 100644
--- a/meta/packages/xorg-util/imake_X11R7.1-1.0.2.bb
+++ b/meta/packages/xorg-util/imake_1.0.2.bb
@@ -4,3 +4,4 @@ DESCRIPTION = "imake utility"
4 4
5DEPENDS += " perl xproto" 5DEPENDS += " perl xproto"
6 6
7PE = "1"
diff --git a/meta/packages/xorg-util/lndir_X11R7.0-1.0.1.bb b/meta/packages/xorg-util/lndir_1.0.1.bb
index 09a7787ee3..a071d28660 100644
--- a/meta/packages/xorg-util/lndir_X11R7.0-1.0.1.bb
+++ b/meta/packages/xorg-util/lndir_1.0.1.bb
@@ -4,3 +4,4 @@ require xorg-util-common.inc
4 4
5DEPENDS += " xproto" 5DEPENDS += " xproto"
6 6
7PE = "1"
diff --git a/meta/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-util/makedepend-native_1.0.0.bb
index 1b8476be47..833d2daa92 100644
--- a/meta/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb
+++ b/meta/packages/xorg-util/makedepend-native_1.0.0.bb
@@ -3,8 +3,9 @@ inherit native
3 3
4#DESCRIPTION = "" 4#DESCRIPTION = ""
5 5
6SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/makedepend-${PV}.tar.bz2" 6XORG_PN = "makedepend"
7S="${WORKDIR}/makedepend-${PV}" 7S = "${WORKDIR}/makedepend-${PV}"
8 8
9DEPENDS += " util-macros-native xproto-native" 9DEPENDS += " util-macros-native xproto-native"
10 10
11PE = "1"
diff --git a/meta/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb b/meta/packages/xorg-util/makedepend_1.0.0.bb
index 09a7787ee3..a071d28660 100644
--- a/meta/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb
+++ b/meta/packages/xorg-util/makedepend_1.0.0.bb
@@ -4,3 +4,4 @@ require xorg-util-common.inc
4 4
5DEPENDS += " xproto" 5DEPENDS += " xproto"
6 6
7PE = "1"
diff --git a/meta/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb b/meta/packages/xorg-util/util-macros-native_1.1.5.bb
index 64e0550571..2728e83e18 100644
--- a/meta/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb
+++ b/meta/packages/xorg-util/util-macros-native_1.1.5.bb
@@ -1,6 +1,7 @@
1DESCRIPTION = "X autotools macros" 1DESCRIPTION = "X autotools macros"
2SECTION = "x11/libs" 2SECTION = "x11/libs"
3LICENSE= "Xorg" 3LICENSE= "Xorg"
4PE = "1"
4 5
5SRC_URI = "${XORG_MIRROR}/individual/util/util-macros-1.1.5.tar.bz2 \ 6SRC_URI = "${XORG_MIRROR}/individual/util/util-macros-1.1.5.tar.bz2 \
6 file://unbreak_cross_compile.patch;patch=1 " 7 file://unbreak_cross_compile.patch;patch=1 "
diff --git a/meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb
deleted file mode 100644
index 239750bb80..0000000000
--- a/meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1DESCRIPTION = "X autotools macros"
2SECTION = "x11/libs"
3LICENSE= "Xorg"
4
5SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/util-macros-${PV}.tar.bz2"
6S = "${WORKDIR}/util-macros-${PV}"
7
8inherit native autotools pkgconfig
9
diff --git a/meta/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb b/meta/packages/xorg-util/util-macros_1.1.5.bb
index 06dd0a5d73..7fa9a07c05 100644
--- a/meta/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb
+++ b/meta/packages/xorg-util/util-macros_1.1.5.bb
@@ -2,7 +2,7 @@ require xorg-util-common.inc
2 2
3DESCRIPTION = "X autotools macros" 3DESCRIPTION = "X autotools macros"
4 4
5PR = "r1" 5PE = "1"
6 6
7SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-1.1.5.tar.gz \ 7SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-1.1.5.tar.gz \
8 file://unbreak_cross_compile.patch;patch=1 " 8 file://unbreak_cross_compile.patch;patch=1 "
diff --git a/meta/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/xorg-cf-files_1.0.2.bb
index f1b6b0d4f7..c0a3974d26 100644
--- a/meta/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb
+++ b/meta/packages/xorg-util/xorg-cf-files_1.0.2.bb
@@ -3,5 +3,6 @@ require xorg-util-common.inc
3#DESCRIPTION = "" 3#DESCRIPTION = ""
4 4
5#DEPENDS += " " 5#DEPENDS += " "
6PE = "1"
6 7
7FILES_${PN} += " /usr/lib/X11/config" 8FILES_${PN} += " /usr/lib/X11/config"
diff --git a/meta/packages/xorg-util/xorg-util-common.inc b/meta/packages/xorg-util/xorg-util-common.inc
index 3cbc346bf0..4dc547f105 100644
--- a/meta/packages/xorg-util/xorg-util-common.inc
+++ b/meta/packages/xorg-util/xorg-util-common.inc
@@ -4,7 +4,8 @@ LICENSE = "MIT-X"
4 4
5#DEPENDS = "" 5#DEPENDS = ""
6XORG_PN = "${PN}" 6XORG_PN = "${PN}"
7SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/util/${XORG_PN}-${PV}.tar.gz" 7XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}"
8SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/util/${XORG_PN}-${PV}.tar.gz"
8S = "${WORKDIR}/${XORG_PN}-${PV}" 9S = "${WORKDIR}/${XORG_PN}-${PV}"
9 10
10inherit autotools pkgconfig 11inherit autotools pkgconfig