[oe-commits] org.oe.dev merge of '88f5fe35a17263e7916fdae03fcab22c2fadea72'

[oe commit]

merge of '88f5fe35a17263e7916fdae03fcab22c2fadea72'
     and 'bf587e15b3b89ef1d11762c426f618a151a0c287'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 04d0454ec090cc21097b06e5c616a88caf7bacc7
ViewMTN: http://monotone.openembedded.org/revision/info/04d0454ec090cc21097b06e5c616a88caf7bacc7
Files:
1
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom.inc
packages/libidl/libidl-native_0.8.6.bb
packages/libidl/libidl-native_0.8.10.bb
packages/libidl/libidl_0.8.6.bb
packages/libidl/libidl_0.8.10.bb
packages/libidl/libidl.inc
packages/libidl/libidl_0.8.2.bb
packages/libidl/libidl_0.8.3.bb
Diffs:

#
# mt diff -r88f5fe35a17263e7916fdae03fcab22c2fadea72 -r04d0454ec090cc21097b06e5c616a88caf7bacc7
#
#
#
# patch "conf/distro/angstrom-2008.1.conf"
#  from [c5203ad6cf4154e5f329808d72d5564566bb46c7]
#    to [f5acb6c6c6bd5ab3cb43d9fed4bc7b0c1b56ee5d]
# 
# patch "conf/distro/include/angstrom.inc"
#  from [bcc8e68fc74683815da646c745d83634b83c7754]
#    to [8f35eb4c175e2e7405247bb541234a9ff033a3f0]
#
============================================================
--- conf/distro/angstrom-2008.1.conf	c5203ad6cf4154e5f329808d72d5564566bb46c7
+++ conf/distro/angstrom-2008.1.conf	f5acb6c6c6bd5ab3cb43d9fed4bc7b0c1b56ee5d
@@ -20,6 +20,9 @@ DISTRO_REVISION = "1"
 DISTRO_VERSION = "2008.1-test-${DATE}"
 DISTRO_REVISION = "1"
 
+#build staging from packages
+INHERIT += "packaged-staging"
+
 require conf/distro/include/sane-srcdates.inc
 require conf/distro/include/sane-srcrevs.inc
 require conf/distro/include/angstrom-2008-preferred-versions.inc
============================================================
--- conf/distro/include/angstrom.inc	bcc8e68fc74683815da646c745d83634b83c7754
+++ conf/distro/include/angstrom.inc	8f35eb4c175e2e7405247bb541234a9ff033a3f0
@@ -49,9 +49,6 @@ INHERIT += "testlab"
 #save statistical info on images
 INHERIT += "testlab"
 
-#build staging from packages
-#INHERIT += "packaged-staging"
-
 ANGSTROM_PKG_FORMAT ?= "ipk"
 require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc
 


#
# mt diff -rbf587e15b3b89ef1d11762c426f618a151a0c287 -r04d0454ec090cc21097b06e5c616a88caf7bacc7
#
#
#
# rename "packages/libidl/libidl-native_0.8.6.bb"
#     to "packages/libidl/libidl-native_0.8.10.bb"
# 
# rename "packages/libidl/libidl_0.8.6.bb"
#     to "packages/libidl/libidl_0.8.10.bb"
# 
# add_file "packages/libidl/libidl.inc"
#  content [374b624af34034724ad859466068e8f9107abb5e]
# 
# patch "packages/libidl/libidl_0.8.10.bb"
#  from [8f435cc271fab3eb7b68ccffd543e049e178b89e]
#    to [83fa5843d50ee22a441530dd341d355e7ad61279]
# 
# patch "packages/libidl/libidl_0.8.2.bb"
#  from [04b0aad36b91521563e15a8f7552fe71538ace92]
#    to [ea12b4f9911c56399426da9e933e8fe9ae3a86de]
# 
# patch "packages/libidl/libidl_0.8.3.bb"
#  from [3fd7da06c7073aaedd836974389d20d4d6e09ca3]
#    to [a2fbd714aa3776d7dfcfcd9363edfe9aa5270f77]
#
============================================================
--- packages/libidl/libidl.inc	374b624af34034724ad859466068e8f9107abb5e
+++ packages/libidl/libidl.inc	374b624af34034724ad859466068e8f9107abb5e
@@ -0,0 +1,16 @@
+DESCRIPTION = "Library for parsing CORBA IDL files"
+SECTION = "x11/gnome/libs"
+LICENSE = "LGPL"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz2"
+
+S = "${WORKDIR}/libIDL-${PV}"
+
+do_stage() {
+	autotools_stage_all
+}
+
+FILES_${PN} = "${libdir}/*.so.*"
+FILES_${PN}-dev += " ${bindir}"
============================================================
--- packages/libidl/libidl_0.8.6.bb	8f435cc271fab3eb7b68ccffd543e049e178b89e
+++ packages/libidl/libidl_0.8.10.bb	83fa5843d50ee22a441530dd341d355e7ad61279
@@ -1,18 +1,8 @@
-DESCRIPTION = "Library for parsing CORBA IDL files"
-SECTION = "x11/gnome/libs"
-LICENSE = "LGPL"
+require libidl.inc
+
 DEPENDS = "glib-2.0 libidl-native"
-PR = "r3"
 
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz2"
-S = "${WORKDIR}/libIDL-${PV}"
+PR = "r0"
 
 BINCONFIG_GLOB = "*-config-2"
 inherit autotools pkgconfig binconfig
-
-do_stage() {
-	autotools_stage_all
-}
-
-FILES_${PN} = "${libdir}/*.so.*"
-FILES_${PN}-dev += " ${bindir}"
============================================================
--- packages/libidl/libidl_0.8.2.bb	04b0aad36b91521563e15a8f7552fe71538ace92
+++ packages/libidl/libidl_0.8.2.bb	ea12b4f9911c56399426da9e933e8fe9ae3a86de
@@ -1,10 +1,3 @@
-SECTION = "x11/gnome/libs"
-LICENSE = "LGPL"
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2"
-S = "${WORKDIR}/libIDL-${PV}"
+require libidl.inc
 
+PR = "r1"
-inherit autotools  pkgconfig
-
-do_stage () {
-	autotools_stage_all
-}
============================================================
--- packages/libidl/libidl_0.8.3.bb	3fd7da06c7073aaedd836974389d20d4d6e09ca3
+++ packages/libidl/libidl_0.8.3.bb	a2fbd714aa3776d7dfcfcd9363edfe9aa5270f77
@@ -1,20 +1,13 @@
-DESCRIPTION = "Library for parsing CORBA IDL files"
-SECTION = "x11/gnome/libs"
-LICENSE = "LGPL"
-DEPENDS = "glib-2.0"
-PR = "r2"
+require libidl.inc
 
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz2"
-S = "${WORKDIR}/libIDL-${PV}"
+DEPENDS = "glib-2.0"
 
-inherit autotools pkgconfig
+PR = "r3"
 
 # Firefox uses the libIDL-config-2 script instead of pkgconfig (for some
 # strange reason - so we do some sed fu to fix the path there
 
-do_stage() {
-	autotools_stage_all
-
+do_stage_prepend() {
 	cp ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR}/libIDL-config-2.orig
 	cat ${STAGING_BINDIR}/libIDL-config-2.orig | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2
 
@@ -22,6 +15,3 @@ do_stage() {
 		mv ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR_CROSS}/libIDL-config-2
 	fi
 }
-
-FILES_${PN} = "${libdir}/*.so.*"
-FILES_${PN}-dev += " ${bindir}"