[oe-commits] Andrea Adami : libxsettings: convert to new-style staging. Bump PR.
git version control
git at git.openembedded.org
Mon Oct 11 21:23:21 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 27be3e925f53f279b4dc9cf621fd08b9a0c0faf0
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=27be3e925f53f279b4dc9cf621fd08b9a0c0faf0
Author: Andrea Adami <andrea.adami at gmail.com>
Date: Sun Oct 10 23:32:42 2010 +0200
libxsettings: convert to new-style staging. Bump PR.
---
recipes/libxsettings/libxsettings_0.11.bb | 22 ++++++++++------------
recipes/libxsettings/libxsettings_svn.bb | 15 +++++++--------
2 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/recipes/libxsettings/libxsettings_0.11.bb b/recipes/libxsettings/libxsettings_0.11.bb
index 92165b0..18fbe63 100644
--- a/recipes/libxsettings/libxsettings_0.11.bb
+++ b/recipes/libxsettings/libxsettings_0.11.bb
@@ -4,28 +4,26 @@ LICENSE = "BSD-X"
PRIORITY = "optional"
DEPENDS = "virtual/libx11"
-PR = "r2"
+PR = "r3"
inherit gpe
headers = "xsettings-common.h"
do_compile_prepend() {
- sed -i -e 's: -s : :g' Makefile
+ sed -i -e 's: -s : :g' Makefile
}
-do_stage () {
- oe_libinstall -so libXsettings ${STAGING_LIBDIR}
+do_install () {
+ gpe_do_install
+ oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel
- mkdir -p ${STAGING_INCDIR}/gpe
- for h in ${headers}; do
- install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h
- done
-}
+ oe_libinstall -so libXsettings ${D}${libdir}
-do_install () {
- gpe_do_install
- oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel
+ install -d ${D}${includedir}/gpe
+ for h in ${headers}; do
+ install -m 0644 ${S}/$h ${D}${includedir}/$h
+ done
}
SRC_URI[md5sum] = "ea623deae839c41ef68c9a31233157ef"
diff --git a/recipes/libxsettings/libxsettings_svn.bb b/recipes/libxsettings/libxsettings_svn.bb
index f5ce0c0..300d46e 100644
--- a/recipes/libxsettings/libxsettings_svn.bb
+++ b/recipes/libxsettings/libxsettings_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
LICENSE = "BSD-X"
DEPENDS = "virtual/libx11"
PV = "0.11+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
inherit gpe
@@ -15,18 +15,17 @@ SRC_URI = "${GPE_SVN} \
S = "${WORKDIR}/${PN}"
+headers = "xsettings-common.h"
+
do_install () {
gpe_do_install
oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel
-}
-do_stage () {
- oe_libinstall -so libXsettings ${STAGING_LIBDIR}
- mkdir -p ${STAGING_INCDIR}/gpe
+
+ oe_libinstall -so libXsettings ${D}${libdir}
+ install -d ${D}${includedir}/gpe
for h in ${headers}; do
- install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h
+ install -m 0644 ${S}/$h ${D}${includedir}/$h
done
}
-headers = "xsettings-common.h"
-
DEFAULT_PREFERENCE = "-1"
More information about the Openembedded-commits
mailing list