diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-07-03 10:59:12 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-07-03 10:59:12 +0000 |
commit | 1811e7955c524ce4909575905c10320be3160a7a (patch) | |
tree | 1cc2f046c50104b3b0b772c9707567f5e0190631 /meta/packages/xorg-util | |
parent | ceff6f9b7071a9d07b8007cf61a74af1b587ceb9 (diff) | |
download | openembedded-core-1811e7955c524ce4909575905c10320be3160a7a.tar.gz openembedded-core-1811e7955c524ce4909575905c10320be3160a7a.tar.bz2 openembedded-core-1811e7955c524ce4909575905c10320be3160a7a.tar.xz openembedded-core-1811e7955c524ce4909575905c10320be3160a7a.zip |
xorg-util: X11 cleanup
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2081 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-util')
-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.bb | 9 | ||||
-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.inc | 3 |
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 f9dc1f3d3..e943b70aa 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 #DEPENDS += " " +PE = "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 b2b11cf03..62611cc89 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" DEPENDS += " perl xproto" +PE = "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 09a7787ee..a071d2866 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 DEPENDS += " xproto" +PE = "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 1b8476be4..833d2daa9 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 #DESCRIPTION = "" -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/makedepend-${PV}.tar.bz2" -S="${WORKDIR}/makedepend-${PV}" +XORG_PN = "makedepend" +S = "${WORKDIR}/makedepend-${PV}" DEPENDS += " util-macros-native xproto-native" +PE = "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 09a7787ee..a071d2866 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 DEPENDS += " xproto" +PE = "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 64e055057..2728e83e1 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 @@ DESCRIPTION = "X autotools macros" SECTION = "x11/libs" LICENSE= "Xorg" +PE = "1" SRC_URI = "${XORG_MIRROR}/individual/util/util-macros-1.1.5.tar.bz2 \ 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 239750bb8..000000000 --- a/meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "X autotools macros" -SECTION = "x11/libs" -LICENSE= "Xorg" - -SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/util-macros-${PV}.tar.bz2" -S = "${WORKDIR}/util-macros-${PV}" - -inherit native autotools pkgconfig - 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 06dd0a5d7..7fa9a07c0 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 DESCRIPTION = "X autotools macros" -PR = "r1" +PE = "1" SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-1.1.5.tar.gz \ 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 f1b6b0d4f..c0a3974d2 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 #DESCRIPTION = "" #DEPENDS += " " +PE = "1" FILES_${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 3cbc346bf..4dc547f10 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" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/util/${XORG_PN}-${PV}.tar.gz" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/util/${XORG_PN}-${PV}.tar.gz" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig |