diff options
author | Richard Purdie <richard@ted.(none)> | 2009-01-18 13:07:33 +0000 |
---|---|---|
committer | Richard Purdie <richard@ted.(none)> | 2009-01-18 13:07:33 +0000 |
commit | 0e7c8367e544a2b4a67bcfc5b63b0b6e27f72187 (patch) | |
tree | 48f394f356d5fc82ccfba4321ecf96d70a01290a /meta-moblin/packages | |
parent | cd9ad548485f10b5d7e94da621263c1b3f30b2d2 (diff) | |
download | openembedded-core-0e7c8367e544a2b4a67bcfc5b63b0b6e27f72187.tar.gz openembedded-core-0e7c8367e544a2b4a67bcfc5b63b0b6e27f72187.tar.bz2 openembedded-core-0e7c8367e544a2b4a67bcfc5b63b0b6e27f72187.zip |
meta-moblin: Convert from recipes to use the autotools_stage class
Diffstat (limited to 'meta-moblin/packages')
-rw-r--r-- | meta-moblin/packages/check/check_0.9.5.bb | 5 | ||||
-rw-r--r-- | meta-moblin/packages/drm/libdrm-psb_git.bb | 6 | ||||
-rw-r--r-- | meta-moblin/packages/gnet/gnet_svn.bb | 6 | ||||
-rw-r--r-- | meta-moblin/packages/gnome/gnome-menus_2.24.0.bb | 2 | ||||
-rw-r--r-- | meta-moblin/packages/libjana/libjana_svn.bb | 6 | ||||
-rw-r--r-- | meta-moblin/packages/pam/pam_1.0.2.bb | 7 | ||||
-rw-r--r-- | meta-moblin/packages/policykit/policykit_0.9.bb | 7 | ||||
-rw-r--r-- | meta-moblin/packages/taglib/taglib_1.5.bb | 6 | ||||
-rw-r--r-- | meta-moblin/packages/xorg-app/xorg-app-common.inc | 6 | ||||
-rw-r--r-- | meta-moblin/packages/xorg-data/xorg-data-common.inc | 6 | ||||
-rw-r--r-- | meta-moblin/packages/xorg-driver/xf86-driver-common.inc | 6 | ||||
-rw-r--r-- | meta-moblin/packages/xorg-xserver/xserver-xf86-common.inc | 6 |
12 files changed, 11 insertions, 58 deletions
diff --git a/meta-moblin/packages/check/check_0.9.5.bb b/meta-moblin/packages/check/check_0.9.5.bb index 80ff77aa0f..45864ea4cb 100644 --- a/meta-moblin/packages/check/check_0.9.5.bb +++ b/meta-moblin/packages/check/check_0.9.5.bb @@ -12,8 +12,3 @@ S = "${WORKDIR}/check-${PV}" inherit autotools_stage pkgconfig EXTRA_OECONF += "--enable-plain-docdir" - -do_stage() { - autotools_stage_all -} - diff --git a/meta-moblin/packages/drm/libdrm-psb_git.bb b/meta-moblin/packages/drm/libdrm-psb_git.bb index d5a2ae28e9..c3a1fda49a 100644 --- a/meta-moblin/packages/drm/libdrm-psb_git.bb +++ b/meta-moblin/packages/drm/libdrm-psb_git.bb @@ -18,8 +18,4 @@ COMPATIBLE_MACHINE = "menlow" LEAD_SONAME = "libdrm.so" -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} +inherit autotools_stage pkgconfig diff --git a/meta-moblin/packages/gnet/gnet_svn.bb b/meta-moblin/packages/gnet/gnet_svn.bb index e9ee15531e..ea2c92ff1a 100644 --- a/meta-moblin/packages/gnet/gnet_svn.bb +++ b/meta-moblin/packages/gnet/gnet_svn.bb @@ -17,8 +17,4 @@ EXTRA_OECONF = "--disable-pthreads" FILES_${PN}-dev += "${libdir}/gnet-2.0" -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} +inherit autotools_stage pkgconfig diff --git a/meta-moblin/packages/gnome/gnome-menus_2.24.0.bb b/meta-moblin/packages/gnome/gnome-menus_2.24.0.bb index 50865f115b..dae1059b75 100644 --- a/meta-moblin/packages/gnome/gnome-menus_2.24.0.bb +++ b/meta-moblin/packages/gnome/gnome-menus_2.24.0.bb @@ -6,7 +6,7 @@ inherit gnome pkgconfig DEPENDS += "intltool" do_stage() { -autotools_stage_all + autotools_stage_all } PACKAGES += "${PN}-python" diff --git a/meta-moblin/packages/libjana/libjana_svn.bb b/meta-moblin/packages/libjana/libjana_svn.bb index f3be4c8cfd..6b15cedf9e 100644 --- a/meta-moblin/packages/libjana/libjana_svn.bb +++ b/meta-moblin/packages/libjana/libjana_svn.bb @@ -4,7 +4,7 @@ DEPENDS = "gtk+ eds-dbus gconf" PV = "0.1.0+svnr${SRCREV}" PR = "r5" -inherit autotools pkgconfig lib_package +inherit autotools_stage pkgconfig lib_package SRC_URI = "svn://svn.o-hand.com/repos/jana/;module=trunk;proto=http" S = "${WORKDIR}/trunk/" @@ -15,10 +15,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-moblin/packages/pam/pam_1.0.2.bb b/meta-moblin/packages/pam/pam_1.0.2.bb index 2a91414d7e..4ef9511c95 100644 --- a/meta-moblin/packages/pam/pam_1.0.2.bb +++ b/meta-moblin/packages/pam/pam_1.0.2.bb @@ -12,12 +12,7 @@ CFLAGS_append = " -fPIC " S = "${WORKDIR}/Linux-PAM-${PV}" -inherit autotools pkgconfig - - -do_stage() { - autotools_stage_all -} +inherit autotools_stage pkgconfig FILES_${PN}-dbg += "${base_libdir}/security/.debug" FILES_${PN}-dbg += "${base_libdir}/security/pam_filter/.debug" diff --git a/meta-moblin/packages/policykit/policykit_0.9.bb b/meta-moblin/packages/policykit/policykit_0.9.bb index b2efd58328..eed1c0fa8d 100644 --- a/meta-moblin/packages/policykit/policykit_0.9.bb +++ b/meta-moblin/packages/policykit/policykit_0.9.bb @@ -10,9 +10,4 @@ EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --di S = "${WORKDIR}/PolicyKit-${PV}" -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - +inherit autotools_stage pkgconfig diff --git a/meta-moblin/packages/taglib/taglib_1.5.bb b/meta-moblin/packages/taglib/taglib_1.5.bb index bf9a89e9f5..f86c881f6c 100644 --- a/meta-moblin/packages/taglib/taglib_1.5.bb +++ b/meta-moblin/packages/taglib/taglib_1.5.bb @@ -14,11 +14,7 @@ SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz \ S = "${WORKDIR}/taglib-${PV}" -inherit autotools pkgconfig binconfig - -do_stage() { - autotools_stage_all -} +inherit autotools_stage pkgconfig binconfig PACKAGES =+ "${PN}-c" FILES_${PN}-dbg += "${bindir}/taglib-config" diff --git a/meta-moblin/packages/xorg-app/xorg-app-common.inc b/meta-moblin/packages/xorg-app/xorg-app-common.inc index cd7f654be2..2dc659a0fa 100644 --- a/meta-moblin/packages/xorg-app/xorg-app-common.inc +++ b/meta-moblin/packages/xorg-app/xorg-app-common.inc @@ -10,10 +10,6 @@ SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} +inherit autotools_stage pkgconfig FILES_${PN} += " /usr/lib/X11/${XORG_PN}" diff --git a/meta-moblin/packages/xorg-data/xorg-data-common.inc b/meta-moblin/packages/xorg-data/xorg-data-common.inc index 46b14d73af..3e652c3e1d 100644 --- a/meta-moblin/packages/xorg-data/xorg-data-common.inc +++ b/meta-moblin/packages/xorg-data/xorg-data-common.inc @@ -7,8 +7,4 @@ XORG_PN = "${PN}" SRC_URI = "${XORG_MIRROR}/individual/data/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} +inherit autotools_stage pkgconfig diff --git a/meta-moblin/packages/xorg-driver/xf86-driver-common.inc b/meta-moblin/packages/xorg-driver/xf86-driver-common.inc index 308d06e0b1..3cb8cd021e 100644 --- a/meta-moblin/packages/xorg-driver/xf86-driver-common.inc +++ b/meta-moblin/packages/xorg-driver/xf86-driver-common.inc @@ -16,11 +16,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug" -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} +inherit autotools_stage pkgconfig # AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement # macro that simply assumes the test succeeds. diff --git a/meta-moblin/packages/xorg-xserver/xserver-xf86-common.inc b/meta-moblin/packages/xorg-xserver/xserver-xf86-common.inc index d31e97a0e2..5a10ecf994 100644 --- a/meta-moblin/packages/xorg-xserver/xserver-xf86-common.inc +++ b/meta-moblin/packages/xorg-xserver/xserver-xf86-common.inc @@ -16,7 +16,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \ S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit autotools pkgconfig +inherit autotools_stage pkgconfig PACKAGES =+ "${PN}-utils" @@ -33,10 +33,6 @@ CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf" SRC_URI += "file://macro_tweak.patch;patch=1" -do_stage() { - autotools_stage_all -} - do_install_append () { install -d ${D}/${sysconfdir}/X11 install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ |