diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-22 11:27:13 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-22 11:44:28 +0100 |
| commit | dc807f54f858419f97e211cd62fd2d30db9a80de (patch) | |
| tree | 59adc7578ccccd566b5db07ed2a8e764c30510d8 | |
| parent | 5c63f8a2494cd74792e1a67b114a90a0a2fdbbcc (diff) | |
| download | openembedded-core-dc807f54f858419f97e211cd62fd2d30db9a80de.tar.gz openembedded-core-dc807f54f858419f97e211cd62fd2d30db9a80de.tar.bz2 openembedded-core-dc807f54f858419f97e211cd62fd2d30db9a80de.zip | |
Finally deprecate all legacy do_stage functions. This changes the existing warning
into a fatal error if any legacy do_stage functions are found.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
88 files changed, 23 insertions, 364 deletions
diff --git a/meta-gnome/packages/gnome/libbonobo.inc b/meta-gnome/packages/gnome/libbonobo.inc index 9f3642b80b..db5c58a51e 100644 --- a/meta-gnome/packages/gnome/libbonobo.inc +++ b/meta-gnome/packages/gnome/libbonobo.inc @@ -27,38 +27,10 @@ do_configure_prepend() { install ${WORKDIR}/gtk-doc.make ./ } -ACTIVATION_HEADERS = "Bonobo_Unknown.h Bonobo_GenericFactory.h Bonobo_Activation_types.h \ - bonobo-activation.h bonobo-activation-async.h bonobo-activation-activate.h \ - bonobo-activation-init.h bonobo-activation-shlib.h bonobo-activation-register.h \ - bonobo-activation-server-info.h bonobo-activation-version.h" - -BONOBO_HEADERS = "Bonobo.h bonobo-arg.h bonobo-context.h bonobo-event-source.h bonobo-exception.h \ - bonobo-generic-factory.h bonobo-item-container.h bonobo-item-handler.h \ - bonobo-listener.h bonobo-main.h bonobo-macros.h bonobo-moniker-extender.h \ - bonobo-moniker-simple.h bonobo-moniker-util.h bonobo-moniker.h bonobo-object.h \ - bonobo-foreign-object.h bonobo-persist-file.h bonobo-persist-stream.h \ - bonobo-persist.h bonobo-persist-client.h bonobo-property-bag.h \ - bonobo-property-bag-client.h bonobo-shlib-factory.h bonobo-storage.h \ - bonobo-stream.h bonobo-stream-client.h bonobo-stream-memory.h \ - bonobo-storage-memory.h bonobo-xobject.h bonobo-i18n.h bonobo-types.h \ - bonobo-app-client.h bonobo-application.h" - do_compile() { oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" } -do_stage() { - install -d ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation - for i in ${ACTIVATION_HEADERS}; do install -m 0644 bonobo-activation/$i ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation/; done - install -d ${STAGING_INCDIR}/libbonobo-2.0/bonobo - for i in ${BONOBO_HEADERS}; do install -m 0644 bonobo/$i ${STAGING_INCDIR}/libbonobo-2.0/bonobo/; done - install -m 0644 libbonobo.h ${STAGING_INCDIR}/libbonobo-2.0/ - install -d ${STAGING_DATADIR}/idl/bonobo-activation-2.0/ - install idl/*.idl ${STAGING_DATADIR}/idl/bonobo-activation-2.0/ - oe_libinstall -so -C bonobo libbonobo-2 ${STAGING_LIBDIR} - oe_libinstall -so -C bonobo-activation libbonobo-activation ${STAGING_LIBDIR} -} - do_install() { oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install } diff --git a/meta-gnome/packages/gnome/libbonoboui_2.18.0.bb b/meta-gnome/packages/gnome/libbonoboui_2.18.0.bb index 53380c6fa0..85840f705c 100644 --- a/meta-gnome/packages/gnome/libbonoboui_2.18.0.bb +++ b/meta-gnome/packages/gnome/libbonoboui_2.18.0.bb @@ -13,47 +13,3 @@ FILES_${PN}-dbg += "${libdir}/bonobo-2.0/samples/.debug \ DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gtk-doc gconf libxml2 libglade" EXTRA_OECONF = "--disable-gtk-doc" - -HEADERS = " \ -bonobo/bonobo-zoomable.h \ -bonobo/bonobo-ui-component.h \ -bonobo/bonobo-dock-layout.h \ -bonobo/bonobo-ui-type-builtins.h \ -bonobo/bonobo-canvas-component.h \ -bonobo/bonobo-widget.h \ -bonobo/bonobo-ui-engine.h \ -bonobo/bonobo-window.h \ -bonobo/bonobo-ui-toolbar.h \ -bonobo/bonobo-dock-band.h \ -bonobo/bonobo-ui-toolbar-item.h \ -bonobo/bonobo-control.h \ -bonobo/bonobo-dock-item.h \ -bonobo/bonobo-ui-config-widget.h \ -bonobo/bonobo-zoomable-frame.h \ -bonobo/bonobo-control-frame.h \ -bonobo/bonobo-dock.h \ -bonobo/bonobo-ui-main.h \ -bonobo/bonobo-canvas-item.h \ -bonobo/bonobo-ui-node.h \ -bonobo/bonobo-socket.h \ -bonobo/bonobo-selector.h \ -bonobo/bonobo-ui-sync.h \ -bonobo/bonobo-ui-util.h \ -bonobo/bonobo-plug.h \ -bonobo/bonobo-ui-toolbar-button-item.h \ -bonobo/bonobo-ui-toolbar-toggle-button-item.h \ -bonobo/bonobo-ui-container.h \ -bonobo/bonobo-file-selector-util.h \ -bonobo/bonobo-property-control.h \ -bonobo/bonobo-selector-widget.h \ -libbonoboui.h \ -bonobo.h \ -" - -do_stage() { - install -d ${STAGING_INCDIR}/libbonoboui-2.0/bonobo - for i in ${HEADERS}; do - install -m 0644 $i ${STAGING_INCDIR}/libbonoboui-2.0/$i - done - oe_libinstall -C bonobo -a -so libbonoboui-2 ${STAGING_LIBDIR} -} diff --git a/meta-gnome/packages/gnome/libgnome_2.24.0.bb b/meta-gnome/packages/gnome/libgnome_2.24.0.bb index 549cda2855..21c5aaa8c1 100644 --- a/meta-gnome/packages/gnome/libgnome_2.24.0.bb +++ b/meta-gnome/packages/gnome/libgnome_2.24.0.bb @@ -14,6 +14,3 @@ FILES_${PN} += "${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so \ FILES_${PN}-dev += "${libdir}/bonobo/monikers/*a" FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug" -do_stage() { - autotools_stage_all -} diff --git a/meta-gnome/packages/gnome/libgnomeui_2.24.0.bb b/meta-gnome/packages/gnome/libgnomeui_2.24.0.bb index d216942140..c379cee729 100644 --- a/meta-gnome/packages/gnome/libgnomeui_2.24.0.bb +++ b/meta-gnome/packages/gnome/libgnomeui_2.24.0.bb @@ -18,7 +18,3 @@ EXTRA_OECONF = "--disable-gtk-doc" do_configure_prepend() { install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h } - -do_stage() { - autotools_stage_all -} diff --git a/meta-gnome/packages/gnome/orbit2_2.14.16.bb b/meta-gnome/packages/gnome/orbit2_2.14.16.bb index 5f6e6f6105..42ade84d1f 100644 --- a/meta-gnome/packages/gnome/orbit2_2.14.16.bb +++ b/meta-gnome/packages/gnome/orbit2_2.14.16.bb @@ -28,19 +28,3 @@ do_configure_prepend() { install ${WORKDIR}/gtk-doc.make ./ } -do_stage() { - oe_libinstall -so -C src/orb libORBit-2 ${STAGING_LIBDIR} - oe_libinstall -so -C src/services/name libORBitCosNaming-2 ${STAGING_LIBDIR} - oe_libinstall -so -C src/services/imodule libORBit-imodule-2 ${STAGING_LIBDIR} - install -m 0644 src/services/name/libname-server-2.a ${STAGING_LIBDIR}/ - - for dir in orbit orbit/poa orbit/orb-core orbit/util orbit/dynamic; do - install -d ${STAGING_INCDIR}/orbit-2.0/$dir - ( cd include/$dir; for i in *.h; do install -m 0644 $i ${STAGING_INCDIR}/orbit-2.0/$dir/$i; done ) - done - - install -d ${STAGING_INCDIR}/orbit-2.0/ORBitservices - install -m 0644 src/services/name/CosNaming.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/ - install -m 0644 src/services/name/CosNaming_impl.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/ - install -m 0644 src/services/imodule/orbit-imodule.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/ -} diff --git a/meta-gnome/packages/gthumb/gthumb_2.10.11.bb b/meta-gnome/packages/gthumb/gthumb_2.10.11.bb index 1b957e0a8d..2e588d71a8 100644 --- a/meta-gnome/packages/gthumb/gthumb_2.10.11.bb +++ b/meta-gnome/packages/gthumb/gthumb_2.10.11.bb @@ -7,9 +7,5 @@ DEPENDS = "glib-2.0 gtk+ libbonobo libgnome libgnomeui gnome-vfs libxml2 libglad inherit gnome pkgconfig -do_stage () { - autotools_stage_all -} - FILES_${PN} += "${datadir}/icons" FILES_${PN}-dbg += "${libdir}/gthumb/modules/.debug"
\ No newline at end of file diff --git a/meta-moblin/packages/boost/boost-jam-native.inc b/meta-moblin/packages/boost/boost-jam-native.inc index 5293ea5e09..fe181ad00f 100644 --- a/meta-moblin/packages/boost/boost-jam-native.inc +++ b/meta-moblin/packages/boost/boost-jam-native.inc @@ -21,7 +21,6 @@ do_compile() { ./build.sh gcc } -NATIVE_INSTALL_WORKS = "1" # This is too terrible - the build script doesn't give any good # way I can see to find out where the binaries are placed, so # rely on only one bin.foo directory being created. diff --git a/meta-moblin/packages/consolekit/consolekit_0.3.0.bb b/meta-moblin/packages/consolekit/consolekit_0.3.0.bb index b4656c099d..fcd735d7ad 100644 --- a/meta-moblin/packages/consolekit/consolekit_0.3.0.bb +++ b/meta-moblin/packages/consolekit/consolekit_0.3.0.bb @@ -8,10 +8,6 @@ SRC_URI = "http://people.freedesktop.org/~mccann/dist/ConsoleKit-${PV}.tar.bz2 \ file://nopolkit.patch;patch=1" S = "${WORKDIR}/ConsoleKit-${PV}" -do_stage () { - autotools_stage_all -} - FILES_${PN} += "${libdir}/ConsoleKit ${datadir}/dbus-1 ${datadir}/PolicyKit" diff --git a/meta-moblin/packages/gnome/gnome-menus_2.24.1.bb b/meta-moblin/packages/gnome/gnome-menus_2.24.1.bb index dae1059b75..c36b3ef50b 100644 --- a/meta-moblin/packages/gnome/gnome-menus_2.24.1.bb +++ b/meta-moblin/packages/gnome/gnome-menus_2.24.1.bb @@ -5,10 +5,6 @@ inherit gnome pkgconfig DEPENDS += "intltool" -do_stage() { - autotools_stage_all -} - PACKAGES += "${PN}-python" FILES_${PN} += "${datadir}/desktop-directories/" FILES_${PN}-python = "${libdir}/python*" diff --git a/meta-moblin/packages/gnome/gvfs_1.0.2.bb b/meta-moblin/packages/gnome/gvfs_1.0.2.bb index b4eab9bd8d..da071c4a64 100644 --- a/meta-moblin/packages/gnome/gvfs_1.0.2.bb +++ b/meta-moblin/packages/gnome/gvfs_1.0.2.bb @@ -15,7 +15,3 @@ FILES_${PN}-dev += "${libdir}/gio/modules/*.la" FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${sysconfdir}/gvfs/mounts/ftp.mount" FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${sysconfdir}/gvfs/mounts/sftp.mount" FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${sysconfdir}/gvfs/mounts/trash.mount" - -do_stage() { - autotools_stage_all -} diff --git a/meta-moblin/packages/libnotify/libnotify_0.4.4.bb b/meta-moblin/packages/libnotify/libnotify_0.4.4.bb index 7c95fb2ad6..a3f622e84d 100644 --- a/meta-moblin/packages/libnotify/libnotify_0.4.4.bb +++ b/meta-moblin/packages/libnotify/libnotify_0.4.4.bb @@ -8,7 +8,3 @@ PR = "r0" SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${PN}-${PV}.tar.gz" inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb b/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb index 93f02c8459..c6d25dccb0 100644 --- a/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb +++ b/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb @@ -20,10 +20,3 @@ FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug" AUTOTOOLS_STAGE_PKGCONFIG = "1" -do_stage() { - autotools_stage_all -} - - - - diff --git a/meta-moblin/packages/pulseaudio/pulseaudio.inc b/meta-moblin/packages/pulseaudio/pulseaudio.inc index 2390e341fd..fd8e60c471 100644 --- a/meta-moblin/packages/pulseaudio/pulseaudio.inc +++ b/ |
