diff options
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/meta-moblin/packages/pulseaudio/pulseaudio.inc @@ -34,10 +34,6 @@ export TARGET_PFPU = "${TARGET_FPU}" OE_LT_RPATH_ALLOW = "any" OE_LT_RPATH_ALLOW[export]="1" -do_stage() { - autotools_stage_all -} - do_install_append() { install -d ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse diff --git a/meta-moblin/packages/uicmoc/uicmoc3-native_3.3.5.bb b/meta-moblin/packages/uicmoc/uicmoc3-native_3.3.5.bb index 1203571f5a..68582850a2 100644 --- a/meta-moblin/packages/uicmoc/uicmoc3-native_3.3.5.bb +++ b/meta-moblin/packages/uicmoc/uicmoc3-native_3.3.5.bb @@ -36,7 +36,6 @@ do_compile() { oe_runmake sub-tools || die "Building tools failed" } -NATIVE_INSTALL_WORKS = "1" do_install() { install -d ${D}${bindir}/ install -d ${D}/qte3/lib/ diff --git a/meta-moblin/packages/xorg-app/xterm_207.bb b/meta-moblin/packages/xorg-app/xterm_207.bb index 547b42d0f1..aae600b545 100644 --- a/meta-moblin/packages/xorg-app/xterm_207.bb +++ b/meta-moblin/packages/xorg-app/xterm_207.bb @@ -22,7 +22,3 @@ do_configure() { oe_runconf } - -do_stage() { - autotools_stage_all -} diff --git a/meta-openmoko/packages/libspiff/libspiff_0.8.3.bb b/meta-openmoko/packages/libspiff/libspiff_0.8.3.bb index f91005ec8a..f10ff59f69 100644 --- a/meta-openmoko/packages/libspiff/libspiff_0.8.3.bb +++ b/meta-openmoko/packages/libspiff/libspiff_0.8.3.bb @@ -19,7 +19,3 @@ EXTRA_OECONF = "\ CPPFLAGS += "-I${S}/include" -do_stage() { - autotools_stage_all -} - diff --git a/meta-openmoko/packages/liburiparser/liburiparser_0.5.1.bb b/meta-openmoko/packages/liburiparser/liburiparser_0.5.1.bb index 60c88cba23..55ef0a057e 100644 --- a/meta-openmoko/packages/liburiparser/liburiparser_0.5.1.bb +++ b/meta-openmoko/packages/liburiparser/liburiparser_0.5.1.bb @@ -9,7 +9,4 @@ S = "${WORKDIR}/uriparser-${PV}" inherit autotools pkgconfig -do_stage() { - autotools_stage_all -} diff --git a/meta-openmoko/packages/openmoko2/libjana_svn.bb b/meta-openmoko/packages/openmoko2/libjana_svn.bb index 48779e50fe..85d0f4a631 100644 --- a/meta-openmoko/packages/openmoko2/libjana_svn.bb +++ b/meta-openmoko/packages/openmoko2/libjana_svn.bb @@ -14,10 +14,6 @@ do_configure_prepend() { touch gtk-doc.make } -do_stage() { - autotools_stage_all -} - PACKAGES =+ "libjana-ecal libjana-ecal-dbg \ libjana-gtk libjana-gtk-dbg \ " diff --git a/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb b/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb index 5625bf809d..261116ece7 100644 --- a/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb +++ b/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb @@ -5,7 +5,3 @@ PR = "r2" inherit openmoko2 -do_stage() { - autotools_stage_all -} - diff --git a/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb b/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb index 354b8e3f26..d9fd351c84 100644 --- a/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb +++ b/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb @@ -9,7 +9,4 @@ do_configure_prepend() { touch gtk-doc.make } -do_stage() { - autotools_stage_all -} diff --git a/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb b/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb index a8d53ff2d5..a715ff8f0d 100644 --- a/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb +++ b/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb @@ -4,7 +4,3 @@ PV = "0.3.0+svnr${SRCREV}" PR = "r0" inherit openmoko2 - -do_stage() { - autotools_stage_all -} diff --git a/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb b/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb index 3785074a82..f427fa8f99 100644 --- a/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb +++ b/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb @@ -8,8 +8,3 @@ inherit openmoko2 do_configure_prepend() { touch gtk-doc.make } - -do_stage() { - autotools_stage_all -} - diff --git a/meta-openmoko/packages/openmoko2/openmoko-libs.inc b/meta-openmoko/packages/openmoko2/openmoko-libs.inc index 9166934fee..13a9d8d62f 100644 --- a/meta-openmoko/packages/openmoko2/openmoko-libs.inc +++ b/meta-openmoko/packages/openmoko2/openmoko-libs.inc @@ -7,7 +7,3 @@ inherit autotools pkgconfig SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/libraries;module=${REAL_PN};proto=http" S = "${WORKDIR}/${PN}" - -do_stage() { - autotools_stage_all -} diff --git a/meta-openmoko/packages/usbpath/usbpath-native_svn.bb b/meta-openmoko/packages/usbpath/usbpath-native_svn.bb index 3b5ef7bdcd..7389e161c4 100644 --- a/meta-openmoko/packages/usbpath/usbpath-native_svn.bb +++ b/meta-openmoko/packages/usbpath/usbpath-native_svn.bb @@ -1,8 +1,3 @@ require usbpath_svn.bb inherit native DEPENDS = "libusb-native" - -do_stage () { - autotools_stage_all -} - diff --git a/meta-openmoko/packages/usbpath/usbpath_svn.bb b/meta-openmoko/packages/usbpath/usbpath_svn.bb index 0a06477b9a..0c0873ffe1 100644 --- a/meta-openmoko/packages/usbpath/usbpath_svn.bb +++ b/meta-openmoko/packages/usbpath/usbpath_svn.bb @@ -12,7 +12,3 @@ S = "${WORKDIR}/usbpath" inherit autotools -do_stage () { - autotools_stage_all -} - diff --git a/meta-openmoko/packages/vala/vala_0.1.5.bb b/meta-openmoko/packages/vala/vala_0.1.5.bb index 0d357945b7..b83d19650a 100644 --- a/meta-openmoko/packages/vala/vala_0.1.5.bb +++ b/meta-openmoko/packages/vala/vala_0.1.5.bb @@ -9,7 +9,3 @@ S = "${WORKDIR}/vala-${PV}" inherit autotools lib_package -do_stage() { - autotools_stage_all -} - diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 20dc72a1df..649e269f3e 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -1,6 +1,3 @@ -# use autotools_stage_all for native packages -AUTOTOOLS_NATIVE_STAGE_INSTALL = "1" - def autotools_dep_prepend(d): if bb.data.getVar('INHIBIT_AUTOTOOLS_DEPS', d, 1): return '' @@ -204,8 +201,4 @@ autotools_stage_all() { rm -rf ${STAGE_TEMP} } -do_stage () { - autotools_stage_all -} - EXPORT_FUNCTIONS do_configure do_install diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass index 3b1280c07b..513f0b3ce7 100644 --- a/meta/classes/cpan.bbclass +++ b/meta/classes/cpan.bbclass @@ -31,9 +31,8 @@ cpan_do_compile () { oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" LD="${CCLD}" } -NATIVE_INSTALL_WORKS = "1" cpan_do_install () { oe_runmake DESTDIR="${D}" install_vendor } -EXPORT_FUNCTIONS do_configure do_compile do_install do_stage +EXPORT_FUNCTIONS do_configure do_compile do_install diff --git a/meta/classes/cpan_build.bbclass b/meta/classes/cpan_build.bbclass index 944e8d4ac0..dd8d5434d5 100644 --- a/meta/classes/cpan_build.bbclass +++ b/meta/classes/cpan_build.bbclass @@ -42,7 +42,6 @@ cpan_build_do_compile () { perl Build } -NATIVE_INSTALL_WORKS = "1" cpan_build_do_install () { perl Build install } diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index b7dbd86c35..de44e99d70 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -50,10 +50,6 @@ do_install () { oe_runmake 'DESTDIR=${D}' install } -do_stage () { - autotools_stage_all -} - # # Override the default sysroot staging copy since this won't look like a target system # diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 9d678fd802..529f1c259d 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -66,25 +66,6 @@ STAGING_DIR_TARGET = "" SHLIBSDIR = "${STAGING_DIR_NATIVE}/shlibs" PKG_CONFIG_DIR = "${libdir}/pkgconfig" -# -# If changing this function, please make sure packaged-staging.bbclass is -# updated too -# -do_stage_native () { - # If autotools is active, use the autotools staging function, else - # use our "make install" equivalent - if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" == "1" ] - then - autotools_stage_all - else - oe_runmake install - fi -} - -do_stage () { - do_stage_native -} - PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}" PKG_CONFIG_SYSROOT_DIR = "" @@ -93,11 +74,6 @@ ORIG_DEPENDS := "${DEPENDS}" DEPENDS_virtclass-native ?= "${ORIG_DEPENDS}" python __anonymous () { - # If we've a legacy native do_stage, we need to neuter do_install - stagefunc = bb.data.getVar('do_stage', d, True) - if (stagefunc.strip() != "do_stage_native" and stagefunc.strip() != "autotools_stage_all") and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1": - bb.data.setVar("do_install", " :", d) - if "native" in (bb.data.getVar('BBCLASSEXTEND', d, True) or ""): pn = bb.data.getVar("PN", d, True) depends = bb.data.getVar("DEPENDS_virtclass-native", d, True) diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index b771b92fae..0b2e457a93 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -76,21 +76,6 @@ sysroot_stage_all() { sysroot_stage_dirs ${D} ${SYSROOT_DESTDIR} } -def is_legacy_staging(d): - stagefunc = bb.data.getVar('do_stage', d, True) - legacy = True - if stagefunc is None: - legacy = False - elif stagefunc.strip() == "use_do_install_for_stage": - legacy = False - elif stagefunc.strip() == "autotools_stage_all": - legacy = False - elif stagefunc.strip() == "do_stage_native" and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1": - legacy = False - elif bb.data.getVar('NATIVE_INSTALL_WORKS', d, 1) == "1": - legacy = False - return legacy - do_populate_sysroot[dirs] = "${STAGING_DIR_TARGET}/${bindir} ${STAGING_DIR_TARGET}/${libdir} \ ${STAGING_DIR_TARGET}/${includedir} \ ${STAGING_BINDIR_NATIVE} ${STAGING_LIBDIR_NATIVE} \ @@ -119,36 +104,31 @@ python do_populate_sysroot () { pstageactive = (bb.data.getVar("PSTAGING_ACTIVE", d, True) == "1") lockfile = bb.data.getVar("SYSROOT_LOCK", d, True) stagefunc = bb.data.getVar('do_stage', d, True) - legacy = is_legacy_staging(d) - if legacy: - bb.data.setVar("SYSROOT_DESTDIR", "", d) - bb.note("Legacy staging mode for %s" % bb.data.getVar("FILE", d, True)) - lock = bb.utils.lockfile(lockfile) - bb.build.exec_func('populate_sysroot_prehook', d) - bb.build.exec_func('do_stage', d) - for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split(): - bb.build.exec_func(f, d) - bb.build.exec_func('populate_sysroot_posthook', d) - bb.utils.unlockfile(lock) - else: - dest = bb.data.getVar('D', d, True) - sysrootdest = bb.data.expand('${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}', d) - bb.mkdirhier(sysrootdest) - - bb.build.exec_func("sysroot_stage_all", d) - #os.system('cp -pPR %s/* %s/' % (dest, sysrootdest)) - for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split(): - bb.build.exec_func(f, d) - bb.build.exec_func("packagedstaging_fastpath", d) - - lock = bb.utils.lockfile(lockfile) - os.system(bb.data.expand('cp -pPR ${SYSROOT_DESTDIR}${TMPDIR}/* ${TMPDIR}/', d)) - bb.utils.unlockfile(lock) + + dest = bb.data.getVar('D', d, True) + sysrootdest = bb.data.expand('${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}', d) + bb.mkdirhier(sysrootdest) + + bb.build.exec_func("sysroot_stage_all", d) + #os.system('cp -pPR %s/* %s/' % (dest, sysrootdest)) + for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split(): + bb.build.exec_func(f, d) + bb.build.exec_func("packagedstaging_fastpath", d) + + lock = bb.utils.lockfile(lockfile) + os.system(bb.data.expand('cp -pPR ${SYSROOT_DESTDIR}${TMPDIR}/* ${TMPDIR}/', d)) + bb.utils.unlockfile(lock) } +def is_legacy_staging(d): + stagefunc = bb.data.getVar('do_stage', d, True) + if stagefunc is None: + return False + return True + python () { if is_legacy_staging(d): - bb.note("Legacy staging mode for %s" % bb.data.getVar("FILE", d, True)) + bb.fatal("Legacy staging found for %s as it has a do_stage function. This will need conversion to a do_install or often simply removal to work with Poky" % bb.data.getVar("FILE", d, True)) } diff --git a/meta/classes/xlibs.bbclass b/meta/classes/xlibs.bbclass index fc52400b9f..7271d7b029 100644 --- a/meta/classes/xlibs.bbclass +++ b/meta/classes/xlibs.bbclass @@ -5,11 +5,3 @@ XLIBS_CVS = "${FREEDESKTOP_CVS}/xlibs" inherit autotools pkgconfig -do_stage() { - oe_runmake install prefix=${STAGING_DIR_HOST}${prefix} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DIR_HOST}${mandir} -} diff --git a/meta/packages/automake/automake_1.11.1.bb b/meta/packages/automake/automake_1.11.1.bb index 067898a44f..a78b6901f1 100644 --- a/meta/packages/automake/automake_1.11.1.bb +++ b/meta/packages/automake/automake_1.11.1.bb @@ -33,7 +33,6 @@ PATHFIXPATCH_virtclass-native = "" SRC_URI += "${PATHFIXPATCH}" -NATIVE_INSTALL_WORKS = "1" do_install () { oe_runmake 'DESTDIR=${D}' install install -d ${D}${datadir} diff --git a/meta/packages/binutils/binutils-cross-canadian.inc b/meta/packages/binutils/binutils-cross-canadian.inc index 9fe3ed5451..23dfa161eb 100644 --- a/meta/packages/binutils/binutils-cross-canadian.inc +++ b/meta/packages/binutils/binutils-cross-canadian.inc @@ -18,7 +18,3 @@ do_install () { install -m 644 ${S}/include/ansidecl.h ${D}${includedir} install -m 644 ${S}/include/libiberty.h ${D}${includedir} } - -do_stage () { - use_do_install_for_stage -} diff --git a/meta/packages/binutils/binutils-cross.inc b/meta/packages/binutils/binutils-cross.inc index f784a66ce0..b5310a6187 100644 --- a/meta/packages/binutils/binutils-cross.inc +++ b/meta/packages/binutils/binutils-cross.inc @@ -23,7 +23,3 @@ do_install () { rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}64 || : rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${prefix} || : } - -do_stage () { - use_do_install_for_stage -} diff --git a/meta/packages/cdrtools/cdrtools-native_2.01.bb b/meta/packages/cdrtools/cdrtools-native_2.01.bb index b4b496f6e7..2421b23640 100644 --- a/meta/packages/cdrtools/cdrtools-native_2.01.bb +++ b/meta/packages/cdrtools/cdrtools-native_2.01.bb @@ -15,7 +15,6 @@ inherit native STAGE_TEMP="${WORKDIR}/image-temp" -NATIVE_INSTALL_WORKS = "1" do_install() { install -d ${STAGE_TEMP} make install INS_BASE=${STAGE_TEMP} diff --git a/meta/packages/dosfstools/dosfstools_2.10.bb b/meta/packages/dosfstools/dosfstools_2.10.bb index 4d8f6fb8e0..100044b75d 100644 --- a/meta/packages/dosfstools/dosfstools_2.10.bb +++ b/meta/packages/dosfstools/dosfstools_2.10.bb @@ -16,7 +16,6 @@ SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV} file://msdos_fat12_undefined.patch;patch=1 \ file://include-linux-types.patch;patch=1" -NATIVE_INSTALL_WORKS = "1" do_install () { oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \ "MANDIR=${D}${mandir}/man8" install diff --git a/meta/packages/dosfstools/dosfstools_2.11.bb b/meta/packages/dosfstools/dosfstools_2.11.bb index 91430c0b6b..a5f6e034dd 100644 --- a/meta/packages/dosfstools/dosfstools_2.11.bb +++ b/meta/packages/dosfstools/dosfstools_2.11.bb @@ -15,7 +15,6 @@ SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV} file://msdos_fat12_undefined.patch;patch=1 \ file://include-linux-types.patch;patch=1" -NATIVE_INSTALL_WORKS = "1" do_install () { oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \ "MANDIR=${D}${mandir}/man8" install diff --git a/meta/packages/fuse/fuse_2.7.2.bb b/meta/packages/fuse/fuse_2.7.2.bb index a1795e7f0c..d284a25f5f 100644 --- a/meta/packages/fuse/fuse_2.7.2.bb +++ b/meta/packages/fuse/fuse_2.7.2.bb @@ -20,8 +20,3 @@ FILES_fuse-utils-dbg = "${bindir}/.debug ${base_sbindir}/.debug" DEBIAN_NOAUTONAME_fuse-utils = "1" DEBIAN_NOAUTONAME_fuse-utils-dbg = "1" -fakeroot do_stage() { - autotools_stage_all -} - - diff --git a/meta/packages/gcc/gcc-cross-kernel.inc b/meta/packages/gcc/gcc-cross-kernel.inc index 02d44583c9..5347762762 100644 --- a/meta/packages/gcc/gcc-cross-kernel.inc +++ b/meta/packages/gcc/gcc-cross-kernel.inc @@ -8,7 +8,3 @@ do_install () { oe_runmake 'DESTDIR=${D}' install-common install-headers install-libgcc install -m 0755 xgcc ${D}${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}gcc-${PV} } - -do_stage () { - use_do_install_for_stage -}
\ No newline at end of file diff --git a/meta/packages/gcc/gcc-cross.inc b/meta/packages/gcc/gcc-cross.inc index 02b23ffce0..5a796bcde6 100644 --- a/meta/packages/gcc/gcc-cross.inc +++ b/meta/packages/gcc/gcc-cross.inc @@ -3,10 +3,6 @@ inherit cross DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc ${NATIVEDEPS}" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" -do_stage () { - use_do_install_for_stage -} - require gcc-configure-cross.inc require gcc-package-cross.inc diff --git a/meta/packages/glibc/ldconfig-native_2.5.bb b/meta/packages/glibc/ldconfig-native_2.5.bb index 3c3a1b1a64..d08787af6d 100644 --- a/meta/packages/glibc/ldconfig-native_2.5.bb +++ b/meta/packages/glibc/ldconfig-native_2.5.bb @@ -14,7 +14,6 @@ do_compile () { $CC ldconfig.c -std=gnu99 chroot_canon.c xmalloc.c xstrdup.c cache.c readlib.c -I. dl-cache.c -o ldconfig } -NATIVE_INSTALL_WORKS = "1" do_install () { install -d ${D}/${bindir}/ install ldconfig ${D}/${bindir}/ diff --git a/meta/packages/gnu-config/gnu-config_20080123.bb b/meta/packages/gnu-config/gnu-config_20080123.bb index 5dc76524d3..66d027e933 100644 --- a/meta/packages/gnu-config/gnu-config_20080123.bb +++ b/meta/packages/gnu-config/gnu-config_20080123.bb @@ -36,4 +36,3 @@ PACKAGES = "${PN}" FILES_${PN} = "${bindir} ${datadir}/gnu-config" BBCLASSEXTEND = "native" -NATIVE_INSTALL_WORKS = "1" diff --git a/meta/packages/gtk-doc/gtk-doc.bb b/meta/packages/gtk-doc/gtk-doc.bb index b60bc85ed3..3f5e29121b 100644 --- a/meta/packages/gtk-doc/gtk-doc.bb +++ b/meta/packages/gtk-doc/gtk-doc.bb @@ -7,7 +7,6 @@ ALLOW_EMPTY_${PN} = "1" BBCLASSEXTEND = "native" -NATIVE_INSTALL_WORKS = "1" do_install () { install -d ${D}${datadir}/aclocal/ install -m 0644 ${WORKDIR}/gtk-doc.m4 ${D}${datadir}/aclocal/ diff --git a/meta/packages/insserv/insserv_1.11.0.bb b/meta/packages/insserv/insserv_1.11.0.bb index 0fe439ba69..a45ccda48f 100644 --- a/meta/packages/insserv/insserv_1.11.0.bb +++ b/meta/packages/insserv/insserv_1.11.0.bb @@ -9,7 +9,6 @@ SRC_URI = "ftp://ftp.suse.com/pub/projects/init/${BPN}-${PV}.tar.gz \ file://crosscompile_fix.patch;patch=1 \ file://insserv.conf" -NATIVE_INSTALL_WORKS = "1" do_install () { oe_runmake 'DESTDIR=${D}' install install -m0644 ${WORKDIR}/insserv.conf ${D}${sysconfdir}/insserv.conf diff --git a/meta/packages/kern-tools/kern-tools-native_git.bb b/meta/packages/kern-tools/kern-tools-native_git.bb index 417bcb689b..4e4b86b979 100644 --- a/meta/packages/kern-tools/kern-tools-native_git.bb +++ b/meta/packages/kern-tools/kern-tools-native_git.bb @@ -7,9 +7,6 @@ DEPENDS = "git-native" PR = r4 PV = "0.1+git${SRCPV}" -# needed until the native do_stage goes away -NATIVE_INSTALL_WORKS=1 - inherit native SRC_URI = "git://git.pokylinux.org/wr-kernel-tools.git;protocol=git" diff --git a/meta/packages/libsoup/libsoup-2.4_2.31.2.bb b/meta/packages/libsoup/libsoup-2.4_2.31.2.bb index da1499b5fc..9a00e07da0 100644 --- a/meta/packages/libsoup/libsoup-2.4_2.31.2.bb +++ b/meta/packages/libsoup/libsoup-2.4_2.31.2.bb @@ -15,6 +15,3 @@ S = "${WORKDIR}/libsoup-${PV}" inherit autotools pkgconfig -do_stage() { - autotools_stage_all -} diff --git a/meta/packages/libsoup/libsoup-2.4_2.4.1.bb b/meta/packages/libsoup/libsoup-2.4_2.4.1.bb index 303f667dcf..f48ac3d6c9 100644 --- a/meta/packages/libsoup/libsoup-2.4_2.4.1.bb +++ b/meta/packages/libsoup/libsoup-2.4_2.4.1.bb @@ -9,6 +9,3 @@ S = "${WORKDIR}/libsoup-${PV}" inherit autotools pkgconfig -do_stage() { - autotools_stage_all -} diff --git a/meta/packages/makedevs/makedevs_1.0.0.bb b/meta/packages/makedevs/makedevs_1.0.0.bb index 7e87765207..5db2d9b142 100644 --- a/meta/packages/makedevs/makedevs_1.0.0.bb +++ b/meta/packages/makedevs/makedevs_1.0.0.bb @@ -19,4 +19,3 @@ do_install() { } BBCLASSEXTEND = "native" -NATIVE_INSTALL_WORKS = "1" diff --git a/meta/packages/mesa/qemugl_git.bb b/meta/packages/mesa/qemugl_git.bb index 086553fecc..5472901111 100644 --- a/meta/packages/mesa/qemugl_git.bb +++ b/meta/packages/mesa/qemugl_git.bb @@ -16,7 +16,6 @@ PR = "r6" DEFAULT_PREFERENCE = "-1" -NATIVE_INSTALL_WORKS = "1" do_install () { install -d ${D}${libdir}/ if [ "${PN}" != "qemugl-nativesdk" ]; then diff --git a/meta/packages/mtd/mtd-utils_1.3.1.bb b/meta/packages/mtd/mtd-utils_1.3.1.bb index 909b28b21c..faa2332a25 100644 --- a/meta/packages/mtd/mtd-utils_1.3.1.bb +++ b/meta/packages/mtd/mtd-utils_1.3.1.bb @@ -24,4 +24,3 @@ do_install () { PARALLEL_MAKE = "" BBCLASSEXTEND = "native" -NATIVE_INSTALL_WORKS = "1" diff --git a/meta/packages/mutter/mutter.inc b/meta/packages/mutter/mutter.inc index 860d9906d5..456348754f 100644 --- a/meta/packages/mutter/mutter.inc +++ b/meta/packages/mutter/mutter.inc @@ -28,10 +28,6 @@ do_configure_prepend () { echo "EXTRA_DIST=" > ${S}/gnome-doc-utils.make } -do_stage () { - autotools_stage_all -} - pkg_postinst_${PN} () { #!/bin/sh -e if [ "x$D" != "x" ]; then diff --git a/meta/packages/nasm/nasm_2.07.bb b/meta/packages/nasm/nasm_2.07.bb index 5c4f9f6923..4e482a04d6 100644 --- a/meta/packages/nasm/nasm_2.07.bb +++ b/meta/packages/nasm/nasm_2.07.bb @@ -22,4 +22,3 @@ do_install() { } BBCLASSEXTEND = "native" -NATIVE_INSTALL_WORKS = "1" diff --git a/meta/packages/openssl/openssl.inc b/meta/packages/openssl/openssl.inc index a2a1ce67b8..2482585c64 100644 --- a/meta/packages/openssl/openssl.inc +++ b/meta/packages/openssl/openssl.inc @@ -91,7 +91,6 @@ do_compile () { oe_runmake } -NATIVE_INSTALL_WORKS = "1" do_install () { install -m 0755 -d ${D}${libdir}/pkgconfig oe_runmake INSTALL_PREFIX="${D}" install diff --git a/meta/packages/opensync/libopensync_0.37.bb b/meta/packages/opensync/libopensync_0.37.bb index 0748bec99a..e9b8ce202e 100644 --- a/meta/packages/opensync/libopensync_0.37.bb +++ b/meta/packages/opensync/libopensync_0.37.bb @@ -23,6 +23,3 @@ FILES_${PN} += " ${libdir}/opensync*/formats/*.so \ FILES_${PN}-dbg += " ${libdir}/opensync*/formats/.debug/*.so \ ${libdir}/opensync*/.debug/osplugin " -do_stage() { - autotools_stage_all -} diff --git a/meta/packages/opensync/libsyncml_0.5.4.bb b/meta/packages/opensync/libsyncml_0.5.4.bb index 394b3489de..7feb5e0f18 100644 --- a/meta/packages/opensync/libsyncml_0.5.4.bb +++ b/meta/packages/opensync/libsyncml_0.5.4.bb @@ -9,10 +9,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libsyncml/0.5.4/libsyncml-0.5.4.tar.bz2 \ inherit cmake pkgconfig -do_stage() { - autotools_stage_all -} - PACKAGES += "${PN}-tools" FILES_${PN}-tools = "${bindir}" diff --git a/meta/packages/opkg-utils/opkg-utils_svn.bb b/meta/packages/opkg-utils/opkg-utils_svn.bb index 18259b3c39..f3b6f1f4cb 100644 --- a/meta/packages/opkg-utils/opkg-utils_svn.bb +++ b/meta/packages/opkg-utils/opkg-utils_svn.bb @@ -21,5 +21,4 @@ do_install() { oe_runmake PREFIX=${prefix} DESTDIR=${D} install } -NATIVE_INSTALL_WORKS = "1" BBCLASSEXTEND = "native" diff --git a/meta/packages/osc/osc-native_svn.bb b/meta/packages/osc/osc-native_svn.bb index ef9a42a00a..ab0ee0ba3a 100755 --- a/meta/packages/osc/osc-native_svn.bb +++ b/meta/packages/osc/osc-native_svn.bb @@ -12,7 +12,6 @@ S = "${WORKDIR}/osc" inherit native -NATIVE_INSTALL_WORKS = "1" do_install() { BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \ diff --git a/meta/packages/pango/pango.inc b/meta/packages/pango/pango.inc index 2e28cc4431..fa22fa578e 100644 --- a/meta/packages/pango/pango.inc +++ b/meta/packages/pango/pango.inc @@ -26,10 +26,6 @@ EXTRA_OECONF = "--disable-glibtest \ LEAD_SONAME = "libpango-1.0*" LIBV = "1.6.0" -do_stage () { - autotools_stage_all -} - postinst_prologue() { if [ "x$D" != "x" ]; then exit 1 diff --git a/meta/packages/pax-utils/pax-utils_0.2.1.bb b/meta/packages/pax-utils/pax-utils_0.2.1.bb index 404b90c69a..f450f32f1c 100644 --- a/meta/packages/pax-utils/pax-utils_0.2.1.bb +++ b/meta/packages/pax-utils/pax-utils_0.2.1.bb @@ -10,5 +10,4 @@ do_install() { oe_runmake PREFIX=${D}${prefix} DESTDIR=${D} install } -NATIVE_INSTALL_WORKS = "1" BBCLASSEXTEND = "native" diff --git a/meta/packages/perl/perl-native_5.8.8.bb b/meta/packages/perl/perl-native_5.8.8.bb index 05b4c1e64e..534b6700df 100644 --- a/meta/packages/perl/perl-native_5.8.8.bb +++ b/meta/packages/perl/perl-native_5.8.8.bb @@ -56,7 +56,6 @@ do_configure () { -Uusenm -des } -NATIVE_INSTALL_WORKS = "1" do_install () { oe_runmake 'DESTDIR=${D}' install diff --git a/meta/packages/pseudo/pseudo_git.bb b/meta/packages/pseudo/pseudo_git.bb index 92ea897d66..88c7ee2c5a 100644 --- a/meta/packages/pseudo/pseudo_git.bb +++ b/meta/packages/pseudo/pseudo_git.bb @@ -30,8 +30,6 @@ do_install () { oe_runmake 'DESTDIR=${D}' install } -NATIVE_INSTALL_WORKS = "1" - BBCLASSEXTEND = "native" diff --git a/meta/packages/python/python-iniparse-native_0.3.2.bb b/meta/packages/python/python-iniparse-native_0.3.2.bb index 85c7a27ac0..41aa13d97a 100644 --- a/meta/packages/python/python-iniparse-native_0.3.2.bb +++ b/meta/packages/python/python-iniparse-native_0.3.2.bb @@ -3,5 +3,4 @@ inherit native DEPENDS = "python-native" RDEPENDS = "" PR = "r0" -NATIVE_INSTALL_WORKS = "1" diff --git a/meta/packages/python/python-native_2.6.5.bb b/meta/packages/python/python-native_2.6.5.bb index d766853c18..cb95e4b964 100644 --- a/meta/packages/python/python-native_2.6.5.bb +++ b/meta/packages/python/python-native_2.6.5.bb @@ -23,7 +23,6 @@ EXTRA_OEMAKE = '\ STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \ ' -NATIVE_INSTALL_WORKS = "1" do_install() { oe_runmake 'DESTDIR=${D}' install install -d ${D}${bindir}/ diff --git a/meta/packages/python/python-pycurl_7.19.0.bb b/meta/packages/python/python-pycurl_7.19.0.bb index 2af031ebd1..1a04767266 100644 --- a/meta/packages/python/python-pycurl_7.19.0.bb +++ b/meta/packages/python/python-pycurl_7.19.0.bb @@ -26,6 +26,4 @@ export HOST_SYS export STAGING_INCDIR export STAGING_LIBDIR -NATIVE_INSTALL_WORKS = "1" - BBCLASSEXTEND = "native" diff --git a/meta/packages/python/python-pygobject-native_2.21.1.bb b/meta/packages/python/python-pygobject-native_2.21.1.bb index 7699f74b3b..d3602277a4 100644 --- a/meta/packages/python/python-pygobject-native_2.21.1.bb +++ b/meta/packages/python/python-pygobject-native_2.21.1.bb @@ -7,8 +7,6 @@ PARALLEL_MAKE = "" inherit native -NATIVE_INSTALL_WORKS = "1" - SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2" do_install_append() { diff --git a/meta/packages/python/python-pyrex-native_0.9.9.bb b/meta/packages/python/python-pyrex-native_0.9.9.bb index ba70d7d167..90b6b16836 100644 --- a/meta/packages/python/python-pyrex-native_0.9.9.bb +++ b/meta/packages/python/python-pyrex-native_0.9.9.bb @@ -3,5 +3,3 @@ inherit native DEPENDS = "python-native" RDEPENDS = "" PR = "r0" - -NATIVE_INSTALL_WORKS = "1" diff --git a/meta/packages/python/python-scons-native_1.3.0.bb b/meta/packages/python/python-scons-native_1.3.0.bb index d3dd65cbdf..a4bcd4258a 100644 --- a/meta/packages/python/python-scons-native_1.3.0.bb +++ b/meta/packages/python/python-scons-native_1.3.0.bb @@ -4,5 +4,3 @@ DEPENDS = "python-native" RDEPENDS = "" PR = "r0" -NATIVE_INSTALL_WORKS = "1" - diff --git a/meta/packages/python/python-urlgrabber-native_3.9.1.bb b/meta/packages/python/python-urlgrabber-native_3.9.1.bb index 61c0f60d80..ff8f02ecd7 100644 --- a/meta/packages/python/python-urlgrabber-native_3.9.1.bb +++ b/meta/packages/python/python-urlgrabber-native_3.9.1.bb @@ -2,6 +2,3 @@ require python-urlgrabber_${PV}.bb inherit native DEPENDS = "python-native python-pycurl-native" RDEPENDS = "" - -NATIVE_INSTALL_WORKS = "1" - diff --git a/meta/packages/python/yum-metadata-parser-native_1.1.4.bb b/meta/packages/python/yum-metadata-parser-native_1.1.4.bb index d7aae337e0..0a44b99e2c 100644 --- a/meta/packages/python/yum-metadata-parser-native_1.1.4.bb +++ b/meta/packages/python/yum-metadata-parser-native_1.1.4.bb @@ -5,5 +5,3 @@ RDEPENDS = "" PR = "r0" #BUILD_CFLAGS += "-I${STAGING_LIBDIR}/glib-2.0" - -NATIVE_INSTALL_WORKS = "1" diff --git a/meta/packages/shasum/shasum.inc b/meta/packages/shasum/shasum.inc index ad51bcc608..d5f1e8b928 100644 --- a/meta/packages/shasum/shasum.inc +++ b/meta/packages/shasum/shasum.inc @@ -17,7 +17,6 @@ do_compile() { $CC $CFLAGS $CPPFLAGS -o oe_sha256sum main.c sha256.c } -NATIVE_INSTALL_WORKS = "1" do_install() { install -d ${D}${bindir}/ install ${S}/oe_sha256sum ${D}${bindir}/ diff --git a/meta/packages/stage-manager/stagemanager-native_0.0.1.bb b/meta/packages/stage-manager/stagemanager-native_0.0.1.bb index 63beb11add..d6c1b8cf52 100644 --- a/meta/packages/stage-manager/stagemanager-native_0.0.1.bb +++ b/meta/packages/stage-manager/stagemanager-native_0.0.1.bb @@ -17,7 +17,7 @@ INHIBIT_DEFAULT_DEPS = "1" PSTAGING_DISABLED = "1" -NATIVE_INSTALL_WORKS = "1" +# This function is special and allowed to onstall into staging directly do_install() { install -d ${STAGING_BINDIR} install -m 0755 ${WORKDIR}/stage-manager ${STAGING_BINDIR} diff --git a/meta/packages/syslinux/syslinux_3.86.bb b/meta/packages/syslinux/syslinux_3.86.bb index fb26a32fab..5edbd24086 100644 --- a/meta/packages/syslinux/syslinux_3.86.bb +++ b/meta/packages/syslinux/syslinux_3.86.bb @@ -35,7 +35,6 @@ do_compile() { oe_runmake CC="${CC}" installer } -NATIVE_INSTALL_WORKS = "1" do_install() { oe_runmake install INSTALLROOT="${D}" diff --git a/meta/packages/tzcode/tzcode-native_2009r.bb b/meta/packages/tzcode/tzcode-native_2009r.bb index abe4783d00..c9a213b4f8 100644 --- a/meta/packages/tzcode/tzcode-native_2009r.bb +++ b/meta/packages/tzcode/tzcode-native_2009r.bb @@ -9,7 +9,6 @@ S = "${WORKDIR}" inherit native -NATIVE_INSTALL_WORKS = "1" do_install () { install -d ${D}${bindir}/ install -m 755 zic ${D}${bindir}/ diff --git a/meta/packages/uboot/u-boot-mkimage-native_1.3.2.bb b/meta/packages/uboot/u-boot-mkimage-native_1.3.2.bb index 6922d69e07..fcba0d5662 100644 --- a/meta/packages/uboot/u-boot-mkimage-native_1.3.2.bb +++ b/meta/packages/uboot/u-boot-mkimage-native_1.3.2.bb @@ -16,7 +16,6 @@ do_compile () { oe_runmake tools } -NATIVE_INSTALL_WORKS = "1" do_install () { install -d ${D}${bindir}/ install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage diff --git a/meta/packages/uboot/u-boot-mkimage_2009.08.bb b/meta/packages/uboot/u-boot-mkimage_2009.08.bb index 6e6ce1fca1..bf07198beb 100644 --- a/meta/packages/uboot/u-boot-mkimage_2009.08.bb +++ b/meta/packages/uboot/u-boot-mkimage_2009.08.bb @@ -17,7 +17,6 @@ do_compile () { oe_runmake tools } -NATIVE_INSTALL_WORKS = "1" do_install () { install -d ${D}${bindir} install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage diff --git a/meta/packages/udev/udev_141.bb b/meta/packages/udev/udev_141.bb index 5749e0a109..daadf6ec0c 100644 --- a/meta/packages/udev/udev_141.bb +++ b/meta/packages/udev/udev_141.bb @@ -63,6 +63,3 @@ do_install_append_h2200() { install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules } -do_stage () { - autotools_stage_all -} diff --git a/meta/packages/udev/udev_145.bb b/meta/packages/udev/udev_145.bb index ddde694503..9eba5d3bc5 100644 --- a/meta/packages/udev/udev_145.bb +++ b/meta/packages/udev/udev_145.bb @@ -63,6 +63,3 @@ do_install_append_h2200() { install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules } -do_stage () { - autotools_stage_all -} diff --git a/meta/packages/uicmoc/uicmoc4-native.inc b/meta/packages/uicmoc/uicmoc4-native.inc index 23821c3f96..b6933628d9 100644 --- a/meta/packages/uicmoc/uicmoc4-native.inc +++ b/meta/packages/uicmoc/uicmoc4-native.inc @@ -52,7 +52,6 @@ do_compile() { done } -NATIVE_INSTALL_WORKS = "1" do_install() { install -d ${D}${bindir}/ install -m 0755 bin/moc ${D}${bindir}//moc4 diff --git a/meta/packages/unifdef/unifdef-native_2.6.18+git.bb b/meta/packages/unifdef/unifdef-native_2.6.18+git.bb index acdd6acf22..d879782b29 100644 --- a/meta/packages/unifdef/unifdef-native_2.6.18+git.bb +++ b/meta/packages/unifdef/unifdef-native_2.6.18+git.bb @@ -10,8 +10,6 @@ do_compile() { ${CC} ${CFLAGS} ${LDFLAGS} -o unifdef ${WORKDIR}/unifdef.c } -NATIVE_INSTALL_WORKS = "1" - do_install() { install -d ${D}${bindir} install -m 0755 unifdef ${D}${bindir} diff --git a/meta/packages/unzip/unzip_6.0.bb b/meta/packages/unzip/unzip_6.0.bb index 7b0f9dc721..069dfb8781 100644 --- a/meta/packages/unzip/unzip_6.0.bb +++ b/meta/packages/unzip/unzip_6.0.bb @@ -23,4 +23,3 @@ do_install() { } BBCLASSEXTEND = "native" -NATIVE_INSTALL_WORKS = "1" diff --git a/meta/packages/update-alternatives/update-alternatives-dpkg.inc b/meta/packages/update-alternatives/update-alternatives-dpkg.inc index 91f9883ff3..106fa25e14 100644 --- a/meta/packages/update-alternatives/update-alternatives-dpkg.inc +++ b/meta/packages/update-alternatives/update-alternatives-dpkg.inc @@ -19,7 +19,6 @@ do_patch () { p;' > ${S}/scripts/update-alternatives } -NATIVE_INSTALL_WORKS = "1" do_install () { install -d ${D}${sbindir} \ ${D}${localstatedir}/dpkg/alternatives \ diff --git a/meta/packages/update-rc.d/update-rc.d_0.7.bb b/meta/packages/update-rc.d/update-rc.d_0.7.bb index 7f68d866de..03ac5c1a29 100644 --- a/meta/packages/update-rc.d/update-rc.d_0.7.bb +++ b/meta/packages/update-rc.d/update-rc.d_0.7.bb @@ -17,7 +17,6 @@ S = "${WORKDIR}/update-rc.d" do_compile() { } -NATIVE_INSTALL_WORKS = "1" do_install() { install -d ${D}${sbindir} install -m 0755 ${S}/update-rc.d ${D}${sbindir}/update-rc.d diff --git a/meta/packages/x-load/signgp-native.bb b/meta/packages/x-load/signgp-native.bb index 36c5b6ce42..7eabb07bce 100644 --- a/meta/packages/x-load/signgp-native.bb +++ b/meta/packages/x-load/signgp-native.bb @@ -8,7 +8,6 @@ do_compile() { ${CC} ${WORKDIR}/signGP.c -o signGP } -NATIVE_INSTALL_WORKS = "1" do_install() { install -d ${D}${bindir}/ install -m 0755 signGP ${D}${bindir}/ diff --git a/meta/packages/yaffs2/yaffs2-utils.inc b/meta/packages/yaffs2/yaffs2-utils.inc index a451f968c1..b25cc3b590 100644 --- a/meta/packages/yaffs2/yaffs2-utils.inc +++ b/meta/packages/yaffs2/yaffs2-utils.inc @@ -17,7 +17,6 @@ do_compile() { cd utils && oe_runmake } -NATIVE_INSTALL_WORKS = "1" do_install() { install -d ${D}${sbindir}/ for i in mkyaffsimage mkyaffs2image; do diff --git a/meta/packages/zaurus-updater/encdec-updater.bb b/meta/packages/zaurus-updater/encdec-updater.bb index dfc157c026..c59d0e2976 100644 --- a/meta/packages/zaurus-updater/encdec-updater.bb +++ b/meta/packages/zaurus-updater/encdec-updater.bb @@ -10,7 +10,6 @@ do_compile() { ${CC} -o encdec-updater ${WORKDIR}/encdec-updater.c } -NATIVE_INSTALL_WORKS = "1" do_install() { install -d ${D}${bindir} install -m 0755 encdec-updater ${D}${bindir}/ diff --git a/meta/packages/zip/zip.inc b/meta/packages/zip/zip.inc index 9a269ea890..9550447264 100644 --- a/meta/packages/zip/zip.inc +++ b/meta/packages/zip/zip.inc @@ -22,4 +22,3 @@ do_install() { } BBCLASSEXTEND = "native" -NATIVE_INSTALL_WORKS = "1" |