[oe-commits] Koen Kooi : xfce-base apps: convert to new style staging
git version control
git at git.openembedded.org
Fri Apr 23 17:02:33 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: a63e30ddd74bbdf85c6b238a29a5640d485ebf56
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a63e30ddd74bbdf85c6b238a29a5640d485ebf56
Author: Koen Kooi <koen at openembedded.org>
Date: Fri Apr 23 13:46:45 2010 +0200
xfce-base apps: convert to new style staging
---
recipes/xfce-base/exo_0.3.105.bb | 6 +-----
recipes/xfce-base/exo_0.3.4.bb | 6 ++----
recipes/xfce-base/thunar_0.9.0.bb | 6 +-----
recipes/xfce-base/thunar_1.0.1.bb | 6 +-----
recipes/xfce-base/xfce-mcs-manager_4.4.2.bb | 13 +++----------
recipes/xfce-base/xfce4-dev-tools_4.4.0.1.bb | 9 ++++++---
recipes/xfce-base/xfce4-dev-tools_4.6.0.bb | 14 +++++++-------
recipes/xfce-base/xfce4-panel_4.4.2.bb | 7 ++-----
recipes/xfce-base/xfce4-panel_4.6.1.bb | 6 +-----
recipes/xfce-base/xfce4-panel_4.6.2.bb | 6 +-----
recipes/xfce-base/xfce4-panel_4.6.3.bb | 2 +-
recipes/xfce-base/xfce4-settings_4.6.1.bb | 6 +-----
recipes/xfce-base/xfconf_4.6.1.bb | 6 +-----
13 files changed, 28 insertions(+), 65 deletions(-)
diff --git a/recipes/xfce-base/exo_0.3.105.bb b/recipes/xfce-base/exo_0.3.105.bb
index a9dd7f2..9f766ca 100644
--- a/recipes/xfce-base/exo_0.3.105.bb
+++ b/recipes/xfce-base/exo_0.3.105.bb
@@ -1,7 +1,7 @@
DESCRIPTION="XFCE extensions and framework library with session management support"
DEPENDS = "libxfce4util hal liburi-perl-native python-native cairo"
SECTION = "x11"
-PR = "r1"
+PR = "r2"
inherit xfce46 python-dir
@@ -18,10 +18,6 @@ do_configure_prepend() {
sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in
}
-do_stage() {
- autotools_stage_all
-}
-
FILES_${PN} += "${datadir}/xfce4/ \
${PYTHON_SITEPACKAGES_DIR}/* \
${prefix}/share/pygtk/2.0/defs/exo-0.3/exo.defs \
diff --git a/recipes/xfce-base/exo_0.3.4.bb b/recipes/xfce-base/exo_0.3.4.bb
index a378f34..53f489d 100644
--- a/recipes/xfce-base/exo_0.3.4.bb
+++ b/recipes/xfce-base/exo_0.3.4.bb
@@ -1,5 +1,7 @@
DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native"
+PR = "r1"
+
inherit xfce
XFCE_VERSION = 4.4.2
@@ -11,10 +13,6 @@ do_configure_prepend() {
sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in
}
-do_stage() {
- autotools_stage_all
-}
-
FILES_${PN} += "${datadir}/xfce4/ \
${libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.so"
FILES_${PN}-dev += "${libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.*"
diff --git a/recipes/xfce-base/thunar_0.9.0.bb b/recipes/xfce-base/thunar_0.9.0.bb
index 54de213..6895164 100644
--- a/recipes/xfce-base/thunar_0.9.0.bb
+++ b/recipes/xfce-base/thunar_0.9.0.bb
@@ -5,7 +5,7 @@ RRECOMMENDS = "shared-mime-info"
inherit xfce pkgconfig
SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.2/src/Thunar-${PV}.tar.bz2"
-PR = 'r3'
+PR = "r4"
S = "${WORKDIR}/Thunar-${PV}/"
@@ -16,9 +16,5 @@ FILES_${PN} += "${libdir}/thunarx-1/*.so \
${datadir}/xfce4"
FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/ ${libexecdir}/xfce4/panel-plugins/.debug/"
-do_stage () {
- autotools_stage_all
-}
-
SRC_URI[md5sum] = "0fc5008858661c0abd0399acbe30ef28"
SRC_URI[sha256sum] = "26c833b0bdf3281c61e03f1fb985feced88cf4a5cebce7bd055f05e025460037"
diff --git a/recipes/xfce-base/thunar_1.0.1.bb b/recipes/xfce-base/thunar_1.0.1.bb
index a4d0fb2..502831f 100644
--- a/recipes/xfce-base/thunar_1.0.1.bb
+++ b/recipes/xfce-base/thunar_1.0.1.bb
@@ -4,7 +4,7 @@ DEPENDS = "exo dbus-glib libexif xfce4-panel libice libsm gamin"
RDEPENDS = "libxfcegui4 exo dbus-glib libexif xfce4-panel libice libsm gamin"
RRECOMMENDS = "shared-mime-info"
SECTION = "x11"
-PR = "r1"
+PR = "r2"
inherit xfce46
@@ -24,9 +24,5 @@ FILES_${PN} += "${libdir}/thunarx-1/*.so \
${datadir}/xfce4"
FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/ ${libexecdir}/xfce4/panel-plugins/.debug/"
-do_stage () {
- autotools_stage_all
-}
-
SRC_URI[md5sum] = "218373aa45d74b6ba8c69c4d5af3bb19"
SRC_URI[sha256sum] = "7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d"
diff --git a/recipes/xfce-base/xfce-mcs-manager_4.4.2.bb b/recipes/xfce-base/xfce-mcs-manager_4.4.2.bb
index ec9aa02..1ec9fe6 100644
--- a/recipes/xfce-base/xfce-mcs-manager_4.4.2.bb
+++ b/recipes/xfce-base/xfce-mcs-manager_4.4.2.bb
@@ -5,23 +5,16 @@
DESCRIPTION="XFCE4 Settings manager."
DEPENDS="libxfcegui4 libxfce4mcs intltool-native"
SECTION = "x11"
-PR = "r1"
+PR = "r3"
inherit xfce
-do_stage() {
- install -d ${STAGING_INCDIR}/xfce4
- install -d ${STAGING_INCDIR}/xfce4/xfce-mcs-manager
- install -m 644 xfce-mcs-manager/manager-plugin.h ${STAGING_INCDIR}/xfce4/xfce-mcs-manager
-}
-
# xfce-mcs-manager.pc uses ${libdir} to indicate where the mcs plugins live
# the standard pkgconfig mangling was confusing us. Mangling is not required
# for this particular .pc, so the following will suffice:
-do_stage_append () {
- install -d ${PKG_CONFIG_DIR}
- sed -e 's:^includedir=.*:includedir="/usr/include":;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_DIR}/xfce-mcs-manager.pc
+do_install_append () {
+ sed -i -e 's:^includedir=.*:includedir="/usr/include":;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc
}
SRC_URI[md5sum] = "876a4b5d582de8fdc01457df2e7e1339"
diff --git a/recipes/xfce-base/xfce4-dev-tools_4.4.0.1.bb b/recipes/xfce-base/xfce4-dev-tools_4.4.0.1.bb
index 4748792..c154ffe 100644
--- a/recipes/xfce-base/xfce4-dev-tools_4.4.0.1.bb
+++ b/recipes/xfce-base/xfce4-dev-tools_4.4.0.1.bb
@@ -2,14 +2,17 @@ DESCRIPTION = "Xfce4 development tools"
SECTION = "x11/libs"
LICENSE = "GPL"
+PR = "r2"
+
inherit xfce
XFCE_VERSION = 4.4.2
-do_stage() {
- install -d ${STAGING_DATADIR}/aclocal
- install -m 644 m4macros/*.m4 ${STAGING_DATADIR}/aclocal/
+do_install_append() {
+ install -d ${D}${datadir}/aclocal
+ install -m 644 m4macros/*.m4 ${D}${datadir}/aclocal/
}
+
FILES_${PN}-dev += " ${datadir}/xfce4/dev-tools/m4macros/*.m4"
SRC_URI[md5sum] = "7d09d161efc7ef86b3b48791d98c8ae8"
diff --git a/recipes/xfce-base/xfce4-dev-tools_4.6.0.bb b/recipes/xfce-base/xfce4-dev-tools_4.6.0.bb
index f940132..0037f99 100644
--- a/recipes/xfce-base/xfce4-dev-tools_4.6.0.bb
+++ b/recipes/xfce-base/xfce4-dev-tools_4.6.0.bb
@@ -1,20 +1,20 @@
DESCRIPTION = "Xfce4 development tools"
SECTION = "x11/libs"
LICENSE = "GPL"
-PR = "r1"
+PR = "r3"
inherit xfce46
-inherit autotools autotools_stage
+inherit autotools
+
+do_install_append() {
+ install -d ${D}${datadir}/aclocal
+ install -m 644 m4macros/*.m4 ${D}${datadir}/aclocal/
+}
XFCE_VERSION = ${PV}
SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/${PN}-${PV}.tar.bz2"
-do_stage() {
- install -d ${STAGING_DATADIR}/aclocal
- install -m 644 m4macros/*.m4 ${STAGING_DATADIR}/aclocal/
-}
-
FILES_${PN}-dev += " ${datadir}/xfce4/dev-tools/m4macros/*.m4"
SRC_URI[md5sum] = "c9587fa78e877eee858a33391d0afd62"
diff --git a/recipes/xfce-base/xfce4-panel_4.4.2.bb b/recipes/xfce-base/xfce4-panel_4.4.2.bb
index cbb8644..5264503 100644
--- a/recipes/xfce-base/xfce4-panel_4.4.2.bb
+++ b/recipes/xfce-base/xfce4-panel_4.4.2.bb
@@ -8,12 +8,9 @@ DEPENDS = "startup-notification virtual/libx11 libxfcegui4 libxfce4mcs xfce-mcs-
inherit pkgconfig xfce
-EXTRA_OECONF += " --enable-startup-notification"
-
+PR = "r1"
-do_stage() {
-autotools_stage_all
-}
+EXTRA_OECONF += " --enable-startup-notification"
do_install() {
oe_runmake DESTDIR=${D} install
diff --git a/recipes/xfce-base/xfce4-panel_4.6.1.bb b/recipes/xfce-base/xfce4-panel_4.6.1.bb
index 738284c..e048c18 100644
--- a/recipes/xfce-base/xfce4-panel_4.6.1.bb
+++ b/recipes/xfce-base/xfce4-panel_4.6.1.bb
@@ -3,16 +3,12 @@
DESCRIPTION = "Xfce4 Panel"
DEPENDS = "virtual/libx11 startup-notification libxfcegui4 libxml2 exo libwnck"
SECTION = "x11"
-PR = "r2"
+PR = "r3"
inherit xfce46
EXTRA_OECONF += " --enable-startup-notification"
-do_stage() {
- autotools_stage_all
-}
-
do_install() {
oe_runmake DESTDIR=${D} install
}
diff --git a/recipes/xfce-base/xfce4-panel_4.6.2.bb b/recipes/xfce-base/xfce4-panel_4.6.2.bb
index 001b037..4e4f176 100644
--- a/recipes/xfce-base/xfce4-panel_4.6.2.bb
+++ b/recipes/xfce-base/xfce4-panel_4.6.2.bb
@@ -3,16 +3,12 @@
DESCRIPTION = "Xfce4 Panel"
DEPENDS = "virtual/libx11 startup-notification libxfcegui4 libxml2 exo libwnck"
SECTION = "x11"
-PR = "r1"
+PR = "r2"
inherit xfce46
EXTRA_OECONF += " --enable-startup-notification"
-do_stage() {
- autotools_stage_all
-}
-
do_install() {
oe_runmake DESTDIR=${D} install
}
diff --git a/recipes/xfce-base/xfce4-panel_4.6.3.bb b/recipes/xfce-base/xfce4-panel_4.6.3.bb
index 498ee32..bdfa7d6 100644
--- a/recipes/xfce-base/xfce4-panel_4.6.3.bb
+++ b/recipes/xfce-base/xfce4-panel_4.6.3.bb
@@ -3,7 +3,7 @@
DESCRIPTION = "Xfce4 Panel"
DEPENDS = "virtual/libx11 startup-notification libxfcegui4 libxml2 exo libwnck"
SECTION = "x11"
-PR = "r1"
+PR = "r2"
inherit xfce46
diff --git a/recipes/xfce-base/xfce4-settings_4.6.1.bb b/recipes/xfce-base/xfce4-settings_4.6.1.bb
index 5b936b9..529d0cb 100644
--- a/recipes/xfce-base/xfce4-settings_4.6.1.bb
+++ b/recipes/xfce-base/xfce4-settings_4.6.1.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL-2"
DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo libxfce4util"
RDEPENDS = "gtk+ libxfce4util libxfcegui4 xfconf exo"
-PR = "r1"
+PR = "r2"
inherit xfce46
@@ -15,9 +15,5 @@ SRC_URI += " \
file://xfce4-settings-4.6.1-configure.patch;patch=1 \
"
-do_stage() {
-autotools_stage_all
-}
-
SRC_URI[md5sum] = "dc1c8704471c5b0104fa10c30eb60cb6"
SRC_URI[sha256sum] = "36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d"
diff --git a/recipes/xfce-base/xfconf_4.6.1.bb b/recipes/xfce-base/xfconf_4.6.1.bb
index d74df60..ce091ca 100644
--- a/recipes/xfce-base/xfconf_4.6.1.bb
+++ b/recipes/xfce-base/xfconf_4.6.1.bb
@@ -6,14 +6,10 @@ LICENSE = "GPL-2"
DEPENDS = "libxfce4util"
RDEPENDS = "libxfce4util"
-PR = "r1"
+PR = "r2"
inherit xfce46
-do_stage() {
-autotools_stage_all
-}
-
FILES_${PN} += "${datadir}/dbus-1/services/org.xfce.Xfconf.service"
SRC_URI[md5sum] = "d4d3018767ea9eb4b57cc57d4038023b"
More information about the Openembedded-commits
mailing list