summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-12-26 19:02:44 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-12-30 17:07:04 +0000
commite380b48602db316c7d12d328192eadc52e5be861 (patch)
tree78d1c6d7742c79216b01fb0b739adea44c85dc51
parentf9f549d06fd787f93c9c0af607683d0521fcd827 (diff)
downloadpoky-e380b48602db316c7d12d328192eadc52e5be861.tar.gz
classes/autotools_stage.bbclass: Add autotools_stage class to simplify recipes using standard autotools
Diffstat
-rw-r--r--meta/classes/autotools_stage.bbclass5
-rw-r--r--meta/packages/atk/atk.inc6
-rw-r--r--meta/packages/avahi/avahi.inc2
-rw-r--r--meta/packages/avahi/avahi_0.6.23.bb4
-rw-r--r--meta/packages/beecrypt/beecrypt_3.1.0.bb6
-rw-r--r--meta/packages/cairo/cairo.inc2
-rw-r--r--meta/packages/claws-mail/claws-mail.inc6
-rw-r--r--meta/packages/clutter/aaina.inc7
-rw-r--r--meta/packages/clutter/clutter-box2d.inc6
-rw-r--r--meta/packages/clutter/clutter-cairo.inc6
-rw-r--r--meta/packages/clutter/clutter-gst.inc6
-rw-r--r--meta/packages/clutter/clutter-gtk.inc6
-rw-r--r--meta/packages/clutter/clutter-helix.inc6
-rw-r--r--meta/packages/clutter/clutter.inc6
-rw-r--r--meta/packages/clutter/table.inc6
-rw-r--r--meta/packages/clutter/tidy.inc6
-rw-r--r--meta/packages/connman/connman_git.bb6
-rw-r--r--meta/packages/drm/libdrm_2.4.0.bb6
-rw-r--r--meta/packages/drm/libdrm_git.bb6
-rw-r--r--meta/packages/eds/eds-dbus_2.20.0.bb6
-rw-r--r--meta/packages/eds/eds-dbus_svn.bb6
-rw-r--r--meta/packages/file/file_4.18.bb6
-rw-r--r--meta/packages/galago/libgalago_0.5.2.bb6
-rw-r--r--meta/packages/gmp/gmp.inc6
-rw-r--r--meta/packages/gnome/gnome-keyring_2.20.bb6
-rw-r--r--meta/packages/gsm/gsmd.inc6
-rw-r--r--meta/packages/gstreamer/gst-plugins.inc6
-rw-r--r--meta/packages/gstreamer/gstreamer_0.10.20.bb6
-rw-r--r--meta/packages/gupnp/gssdp_0.6.2.bb6
-rw-r--r--meta/packages/gupnp/gupnp_0.12.2.bb7
-rw-r--r--meta/packages/gypsy/gypsy.inc2
-rw-r--r--meta/packages/gypsy/gypsy_0.6.bb2
-rw-r--r--meta/packages/icu/icu-3.6.inc2
-rw-r--r--meta/packages/icu/icu_3.6.bb4
-rw-r--r--meta/packages/iso-codes/iso-codes_3.3.bb7
-rw-r--r--meta/packages/libetpan/libetpan_0.54.bb6
-rw-r--r--meta/packages/libexif/libexif_0.6.16.bb6
-rw-r--r--meta/packages/libgcrypt/libgcrypt.inc6
-rw-r--r--meta/packages/libgdbus/libgdbus_git.bb6
-rw-r--r--meta/packages/wbxml/wbxml2_0.9.2.bb6
-rw-r--r--meta/packages/webkit/webkit-gtk_svn.bb6
-rw-r--r--meta/packages/wv/wv_1.2.0.bb6
-rw-r--r--meta/packages/xcb/libpthread-stubs_0.1.bb6
-rw-r--r--meta/packages/xcb/libxcb.inc6
-rw-r--r--meta/packages/xkeyboard-config/xkeyboard-config_1.3.bb6
-rw-r--r--meta/packages/xorg-app/xorg-app-common.inc6
-rw-r--r--meta/packages/xorg-driver/xf86-driver-common.inc6
-rw-r--r--meta/packages/xorg-lib/xorg-lib-common.inc6
-rw-r--r--meta/packages/xorg-proto/xorg-proto-common.inc6
-rw-r--r--meta/packages/xorg-util/xorg-util-common.inc6
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-common.inc6
51 files changed, 53 insertions, 231 deletions
diff --git a/meta/classes/autotools_stage.bbclass b/meta/classes/autotools_stage.bbclass
new file mode 100644
index 0000000000..010117c250
--- /dev/null
+++ b/meta/classes/autotools_stage.bbclass
@@ -0,0 +1,5 @@
1inherit autotools
2
3do_stage () {
4 autotools_stage_all
5} \ No newline at end of file
diff --git a/meta/packages/atk/atk.inc b/meta/packages/atk/atk.inc
index 5f81cdf67e..9256dfbac8 100644
--- a/meta/packages/atk/atk.inc
+++ b/meta/packages/atk/atk.inc
@@ -5,10 +5,6 @@ LICENSE = "LGPL"
5 5
6DEPENDS = "glib-2.0 gtk-doc-native" 6DEPENDS = "glib-2.0 gtk-doc-native"
7 7
8inherit autotools pkgconfig 8inherit autotools_stage pkgconfig
9 9
10EXTRA_OECONF = "--disable-glibtest" 10EXTRA_OECONF = "--disable-glibtest"
11
12do_stage () {
13 autotools_stage_all
14}
diff --git a/meta/packages/avahi/avahi.inc b/meta/packages/avahi/avahi.inc
index 419b787b5f..8bc9f1b610 100644
--- a/meta/packages/avahi/avahi.inc
+++ b/meta/packages/avahi/avahi.inc
@@ -13,7 +13,7 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
13 file://99avahi-autoipd \ 13 file://99avahi-autoipd \
14 file://initscript.patch;patch=1" 14 file://initscript.patch;patch=1"
15 15
16inherit autotools pkgconfig update-rc.d 16inherit autotools_stage pkgconfig update-rc.d
17 17
18EXTRA_OECONF = "--with-distro=debian \ 18EXTRA_OECONF = "--with-distro=debian \
19 --with-avahi-priv-access-group=adm \ 19 --with-avahi-priv-access-group=adm \
diff --git a/meta/packages/avahi/avahi_0.6.23.bb b/meta/packages/avahi/avahi_0.6.23.bb
index 642b6b916c..87876ac6f2 100644
--- a/meta/packages/avahi/avahi_0.6.23.bb
+++ b/meta/packages/avahi/avahi_0.6.23.bb
@@ -6,7 +6,3 @@ PR = "r8"
6FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ 6FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
7 ${sysconfdir}/avahi/avahi-autoipd.action \ 7 ${sysconfdir}/avahi/avahi-autoipd.action \
8 ${sysconfdir}/dhcp3/*/avahi-autoipd" 8 ${sysconfdir}/dhcp3/*/avahi-autoipd"
9
10do_stage() {
11 autotools_stage_all
12}
diff --git a/meta/packages/beecrypt/beecrypt_3.1.0.bb b/meta/packages/beecrypt/beecrypt_3.1.0.bb
index 947ca56689..78ff5cad29 100644
--- a/meta/packages/beecrypt/beecrypt_3.1.0.bb
+++ b/meta/packages/beecrypt/beecrypt_3.1.0.bb
@@ -7,11 +7,7 @@ HOMEPAGE="http://sourceforge.net/projects/beecrypt"
7SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \ 7SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
8 file://x64fix.patch;patch=1" 8 file://x64fix.patch;patch=1"
9 9
10inherit autotools 10inherit autotools_stage
11acpaths="" 11acpaths=""
12 12
13EXTRA_OECONF="--with-arch=${TARGET_ARCH} --enable-shared --enable-static" 13EXTRA_OECONF="--with-arch=${TARGET_ARCH} --enable-shared --enable-static"
14
15do_stage () {
16 autotools_stage_all
17}
diff --git a/meta/packages/cairo/cairo.inc b/meta/packages/cairo/cairo.inc
index 015e649e64..5618233063 100644
--- a/meta/packages/cairo/cairo.inc
+++ b/meta/packages/cairo/cairo.inc
@@ -8,7 +8,7 @@ LICENSE = "MPL LGPL"
8require cairo-fpu.inc 8require cairo-fpu.inc
9EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)}" 9EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)}"
10 10
11inherit autotools pkgconfig 11inherit autotools_stage pkgconfig
12 12
13do_stage () { 13do_stage () {
14 autotools_stage_all 14 autotools_stage_all
diff --git a/meta/packages/claws-mail/claws-mail.inc b/meta/packages/claws-mail/claws-mail.inc
index be184f9022..fcd4a1dd7f 100644
--- a/meta/packages/claws-mail/claws-mail.inc
+++ b/meta/packages/claws-mail/claws-mail.inc
@@ -39,7 +39,7 @@ EXTRA_OECONF = "--disable-aspell-test \
39 39
40CFLAGS += "-D_GNU_SOURCE" 40CFLAGS += "-D_GNU_SOURCE"
41 41
42inherit autotools pkgconfig 42inherit autotools_stage pkgconfig
43 43
44do_install_append() { 44do_install_append() {
45 install -d ${D}${datadir}/applications 45 install -d ${D}${datadir}/applications
@@ -48,10 +48,6 @@ do_install_append() {
48 install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/ 48 install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/
49} 49}
50 50
51do_stage () {
52 autotools_stage_all
53}
54
55#python populate_packages_prepend () { 51#python populate_packages_prepend () {
56# abiword_libdir = bb.data.expand('${libdir}/claws-mail/plugins', d) 52# abiword_libdir = bb.data.expand('${libdir}/claws-mail/plugins', d)
57# 53#
diff --git a/meta/packages/clutter/aaina.inc b/meta/packages/clutter/aaina.inc
index 1baccc730c..29a0e0c0d6 100644
--- a/meta/packages/clutter/aaina.inc
+++ b/meta/packages/clutter/aaina.inc
@@ -4,9 +4,4 @@ LICENSE = "GPL"
4 4
5DEPENDS = "clutter-0.6 libxml2 gtk+ neon" 5DEPENDS = "clutter-0.6 libxml2 gtk+ neon"
6 6
7inherit autotools pkgconfig 7inherit autotools_stage pkgconfig
8
9do_stage () {
10 autotools_stage_all
11}
12
diff --git a/meta/packages/clutter/clutter-box2d.inc b/meta/packages/clutter/clutter-box2d.inc
index c5cd3283e2..7e279a2a04 100644
--- a/meta/packages/clutter/clutter-box2d.inc
+++ b/meta/packages/clutter/clutter-box2d.inc
@@ -7,11 +7,7 @@ DEPENDS = "clutter-0.8"
7# The main clutter lib is machine specific so we need to be too 7# The main clutter lib is machine specific so we need to be too
8PACKAGE_ARCH = "${MACHINE_ARCH}" 8PACKAGE_ARCH = "${MACHINE_ARCH}"
9 9
10inherit autotools pkgconfig gtk-doc 10inherit autotools_stage pkgconfig gtk-doc
11
12do_stage () {
13 autotools_stage_all
14}
15 11
16do_install_append () { 12do_install_append () {
17 install -d ${D}${bindir} 13 install -d ${D}${bindir}
diff --git a/meta/packages/clutter/clutter-cairo.inc b/meta/packages/clutter/clutter-cairo.inc
index 3a94c35ad6..2e6e3e5ee0 100644
--- a/meta/packages/clutter/clutter-cairo.inc
+++ b/meta/packages/clutter/clutter-cairo.inc
@@ -9,9 +9,5 @@ FILESPATH = "${FILE_DIRNAME}/clutter-cairo"
9PACKAGES =+ "${PN}-examples" 9PACKAGES =+ "${PN}-examples"
10FILES_${PN}-examples = "${bindir}/flowers ${bindir}/clock" 10FILES_${PN}-examples = "${bindir}/flowers ${bindir}/clock"
11 11
12inherit autotools pkgconfig 12inherit autotools_stage pkgconfig
13
14do_stage () {
15 autotools_stage_all
16}
17 13
diff --git a/meta/packages/clutter/clutter-gst.inc b/meta/packages/clutter/clutter-gst.inc
index ad921bd0c0..c3a659767c 100644
--- a/meta/packages/clutter/clutter-gst.inc
+++ b/meta/packages/clutter/clutter-gst.inc
@@ -9,9 +9,5 @@ FILESPATH = "${FILE_DIRNAME}/clutter-gst"
9PACKAGES =+ "${PN}-examples" 9PACKAGES =+ "${PN}-examples"
10FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink ${bindir}/audio" 10FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink ${bindir}/audio"
11 11
12inherit autotools pkgconfig gtk-doc 12inherit autotools_stage pkgconfig gtk-doc
13
14do_stage () {
15 autotools_stage_all
16}
17 13
diff --git a/meta/packages/clutter/clutter-gtk.inc b/meta/packages/clutter/clutter-gtk.inc
index 0545571b44..bbecee548c 100644
--- a/meta/packages/clutter/clutter-gtk.inc
+++ b/meta/packages/clutter/clutter-gtk.inc
@@ -9,9 +9,5 @@ FILESPATH = "${FILE_DIRNAME}/clutter-gtk"
9PACKAGES =+ "${PN}-examples" 9PACKAGES =+ "${PN}-examples"
10FILES_${PN}-examples = "${bindir}/gtk-clutter-test ${bindir}/gtk-clutter-events ${bindir}/gtk-clutter-multistage" 10FILES_${PN}-examples = "${bindir}/gtk-clutter-test ${bindir}/gtk-clutter-events ${bindir}/gtk-clutter-multistage"
11 11
12inherit autotools pkgconfig gtk-doc 12inherit autotools_stage pkgconfig gtk-doc
13
14do_stage () {
15 autotools_stage_all
16}
17 13
diff --git a/meta/packages/clutter/clutter-helix.inc b/meta/packages/clutter/clutter-helix.inc
index 6e0612ad3a..7b17185612 100644
--- a/meta/packages/clutter/clutter-helix.inc
+++ b/meta/packages/clutter/clutter-helix.inc
@@ -9,9 +9,5 @@ FILESPATH = "${FILE_DIRNAME}/clutter-helix"
9PACKAGES =+ "${PN}-examples" 9PACKAGES =+ "${PN}-examples"
10FILES_${PN}-examples = "${bindir}/video-player ${bindir}/audio-player" 10FILES_${PN}-examples = "${bindir}/video-player ${bindir}/audio-player"
11 11
12inherit autotools pkgconfig gtk-doc 12inherit autotools_stage pkgconfig gtk-doc
13
14do_stage () {
15 autotools_stage_all
16}
17 13
diff --git a/meta/packages/clutter/clutter.inc b/meta/packages/clutter/clutter.inc
index 1caa1c74e9..7e9f99269e 100644
--- a/meta/packages/clutter/clutter.inc
+++ b/meta/packages/clutter/clutter.inc
@@ -45,7 +45,7 @@ PACKAGE_ARCH_menlow = "${MACHINE_ARCH}"
45 45
46FILESPATH = "${FILE_DIRNAME}/clutter" 46FILESPATH = "${FILE_DIRNAME}/clutter"
47 47
48inherit autotools pkgconfig gtk-doc 48inherit autotools_stage pkgconfig gtk-doc
49 49
50PACKAGES =+ "clutter-examples" 50PACKAGES =+ "clutter-examples"
51FILES_clutter-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" 51FILES_clutter-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
@@ -58,7 +58,3 @@ do_configure_prepend() {
58 sed -i s:doc/reference/Makefile::g ${S}/configure.ac 58 sed -i s:doc/reference/Makefile::g ${S}/configure.ac
59 sed -i s:doc::g ${S}/Makefile.am 59 sed -i s:doc::g ${S}/Makefile.am
60} 60}
61
62do_stage () {
63 autotools_stage_all
64}
diff --git a/meta/packages/clutter/table.inc b/meta/packages/clutter/table.inc
index b07b39dc1e..6a5b32ccda 100644
--- a/meta/packages/clutter/table.inc
+++ b/meta/packages/clutter/table.inc
@@ -4,14 +4,10 @@ LICENSE = "LGPL"
4 4
5DEPENDS = "clutter-gst-0.6 gnome-vfs" 5DEPENDS = "clutter-gst-0.6 gnome-vfs"
6 6
7inherit autotools pkgconfig 7inherit autotools_stage pkgconfig
8 8
9do_install() { 9do_install() {
10 install -d ${D}${bindir} 10 install -d ${D}${bindir}
11 install -m 0755 ${S}/table ${D}${bindir}/table 11 install -m 0755 ${S}/table ${D}${bindir}/table
12} 12}
13 13
14#do_stage () {
15# autotools_stage_all
16#}
17
diff --git a/meta/packages/clutter/tidy.inc b/meta/packages/clutter/tidy.inc
index d1f11976cd..14ec4ca9a8 100644
--- a/meta/packages/clutter/tidy.inc
+++ b/meta/packages/clutter/tidy.inc
@@ -8,7 +8,7 @@ BASE_CONF = "--disable-gtk-doc"
8DEPENDS = "${STDDEPENDS}" 8DEPENDS = "${STDDEPENDS}"
9EXTRA_OECONF = "${BASE_CONF}" 9EXTRA_OECONF = "${BASE_CONF}"
10 10
11inherit autotools pkgconfig 11inherit autotools_stage pkgconfig
12 12
13PACKAGES =+ "tidy-examples" 13PACKAGES =+ "tidy-examples"
14FILES_tidy-examples = "${bindir}/test-*" 14FILES_tidy-examples = "${bindir}/test-*"
@@ -18,7 +18,3 @@ do_configure_prepend() {
18 sed -i s:docs/reference/Makefile::g ${S}/configure.ac 18 sed -i s:docs/reference/Makefile::g ${S}/configure.ac
19 sed -i s:docs::g ${S}/Makefile.am 19 sed -i s:docs::g ${S}/Makefile.am
20} 20}
21
22do_stage () {
23 autotools_stage_all
24}
diff --git a/meta/packages/connman/connman_git.bb b/meta/packages/connman/connman_git.bb
index e8ad21ef98..5175f45522 100644
--- a/meta/packages/connman/connman_git.bb
+++ b/meta/packages/connman/connman_git.bb
@@ -18,7 +18,7 @@ SRC_URI = "git://moblin.org/repos/projects/connman.git;protocol=http \
18INITSCRIPT_NAME = "connman" 18INITSCRIPT_NAME = "connman"
19INITSCRIPT_PARAMS = "defaults 22" 19INITSCRIPT_PARAMS = "defaults 22"
20 20
21inherit autotools pkgconfig update-rc.d 21inherit autotools_stage pkgconfig update-rc.d
22 22
23do_install_append() { 23do_install_append() {
24 install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman 24 install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
@@ -42,7 +42,3 @@ python populate_packages_prepend() {
42 plugin_name = bb.data.expand('${PN}-plugin-%s', d) 42 plugin_name = bb.data.expand('${PN}-plugin-%s', d)
43 do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='' ) 43 do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='' )
44} 44}
45
46do_stage() {
47 autotools_stage_all
48}
diff --git a/meta/packages/drm/libdrm_2.4.0.bb b/meta/packages/drm/libdrm_2.4.0.bb
index d5e716014f..29b3c4cbf8 100644
--- a/meta/packages/drm/libdrm_2.4.0.bb
+++ b/meta/packages/drm/libdrm_2.4.0.bb
@@ -4,8 +4,4 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
4PROVIDES = "drm" 4PROVIDES = "drm"
5DEPENDS = "libpthread-stubs" 5DEPENDS = "libpthread-stubs"
6 6
7inherit autotools pkgconfig 7inherit autotools_stage pkgconfig
8
9do_stage() {
10 autotools_stage_all
11}
diff --git a/meta/packages/drm/libdrm_git.bb b/meta/packages/drm/libdrm_git.bb
index 27d913c8d7..4765894b37 100644
--- a/meta/packages/drm/libdrm_git.bb
+++ b/meta/packages/drm/libdrm_git.bb
@@ -12,8 +12,4 @@ PV = "2.4.0+git${SRCREV}"
12 12
13LEAD_SONAME = "libdrm.so" 13LEAD_SONAME = "libdrm.so"
14 14
15inherit autotools pkgconfig 15inherit autotools_stage pkgconfig
16
17do_stage() {
18 autotools_stage_all
19}
diff --git a/meta/packages/eds/eds-dbus_2.20.0.bb b/meta/packages/eds/eds-dbus_2.20.0.bb
index 424194fd19..76694ce5a6 100644
--- a/meta/packages/eds/eds-dbus_2.20.0.bb
+++ b/meta/packages/eds/eds-dbus_2.20.0.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/mobile/2.23/2.23.92/sources/evolution-
11 11
12S = "${WORKDIR}/evolution-data-server-dbus-${PV}" 12S = "${WORKDIR}/evolution-data-server-dbus-${PV}"
13 13
14inherit autotools pkgconfig 14inherit autotools_stage pkgconfig
15 15
16# -ldb needs this on some platforms 16# -ldb needs this on some platforms
17LDFLAGS += "-lpthread" 17LDFLAGS += "-lpthread"
@@ -20,10 +20,6 @@ do_configure_append () {
20 cp ${WORKDIR}/iconv-detect.h ${S} 20 cp ${WORKDIR}/iconv-detect.h ${S}
21} 21}
22 22
23do_stage () {
24 autotools_stage_all
25}
26
27EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \ 23EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \
28 --with-soup --with-libdb=${STAGING_DIR_HOST}${layout_prefix} \ 24 --with-soup --with-libdb=${STAGING_DIR_HOST}${layout_prefix} \
29 --disable-smime --disable-nss --disable-nntp --disable-gtk-doc" 25 --disable-smime --disable-nss --disable-nntp --disable-gtk-doc"
diff --git a/meta/packages/eds/eds-dbus_svn.bb b/meta/packages/eds/eds-dbus_svn.bb
index 81d9e83cfb..83b875bd43 100644
--- a/meta/packages/eds/eds-dbus_svn.bb
+++ b/meta/packages/eds/eds-dbus_svn.bb
@@ -13,7 +13,7 @@ SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
13 13
14S = "${WORKDIR}/trunk" 14S = "${WORKDIR}/trunk"
15 15
16inherit autotools pkgconfig 16inherit autotools_stage pkgconfig
17 17
18# -ldb needs this on some platforms 18# -ldb needs this on some platforms
19LDFLAGS += "-lpthread" 19LDFLAGS += "-lpthread"
@@ -22,10 +22,6 @@ do_configure_append () {
22 cp ${WORKDIR}/iconv-detect.h ${S} 22 cp ${WORKDIR}/iconv-detect.h ${S}
23} 23}
24 24
25do_stage () {
26 autotools_stage_all
27}
28
29EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \ 25EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \
30 --with-soup --with-libdb=${STAGING_DIR_HOST}${layout_prefix} \ 26 --with-soup --with-libdb=${STAGING_DIR_HOST}${layout_prefix} \
31 --disable-smime --disable-nss --disable-nntp --disable-gtk-doc" 27 --disable-smime --disable-nss --disable-nntp --disable-gtk-doc"
diff --git a/meta/packages/file/file_4.18.bb b/meta/packages/file/file_4.18.bb
index a98c68009e..c26228a364 100644
--- a/meta/packages/file/file_4.18.bb
+++ b/meta/packages/file/file_4.18.bb
@@ -9,14 +9,10 @@ SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
9 file://filesystems" 9 file://filesystems"
10S = "${WORKDIR}/file-${PV}" 10S = "${WORKDIR}/file-${PV}"
11 11
12inherit autotools 12inherit autotools_stage
13 13
14do_configure_prepend() { 14do_configure_prepend() {
15 sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am 15 sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am
16 cp ${WORKDIR}/dump ${S}/magic/Magdir/ 16 cp ${WORKDIR}/dump ${S}/magic/Magdir/
17 cp ${WORKDIR}/filesystems ${S}/magic/Magdir/ 17 cp ${WORKDIR}/filesystems ${S}/magic/Magdir/
18} 18}
19
20do_stage() {
21 autotools_stage_all
22}
diff --git a/meta/packages/galago/libgalago_0.5.2.bb b/meta/packages/galago/libgalago_0.5.2.bb
index 167f044f62..d4dd3aaba3 100644
--- a/meta/packages/galago/libgalago_0.5.2.bb
+++ b/meta/packages/galago/libgalago_0.5.2.bb
@@ -7,10 +7,6 @@ SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz
7 file://pkgconfig.patch;patch=1 " 7 file://pkgconfig.patch;patch=1 "
8PR = "r1" 8PR = "r1"
9 9
10inherit autotools pkgconfig 10inherit autotools_stage pkgconfig
11 11
12EXTRA_OECONF = "--disable-tests --disable-check" 12EXTRA_OECONF = "--disable-tests --disable-check"
13
14do_stage() {
15 autotools_stage_all
16}
diff --git a/meta/packages/gmp/gmp.inc b/meta/packages/gmp/gmp.inc
index 71ea128bc5..2f99c2f1fd 100644
--- a/meta/packages/gmp/gmp.inc
+++ b/meta/packages/gmp/gmp.inc
@@ -7,12 +7,8 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/gmp/gmp-${PV}.tar.bz2 \
7 file://configure.patch;patch=1 \ 7 file://configure.patch;patch=1 \
8 file://amd64.patch;patch=1" 8 file://amd64.patch;patch=1"
9 9
10inherit autotools 10inherit autotools_stage
11 11
12ARM_INSTRUCTION_SET = "arm" 12ARM_INSTRUCTION_SET = "arm"
13 13
14acpaths = "" 14acpaths = ""
15
16do_stage () {
17 autotools_stage_all
18}
diff --git a/meta/packages/gnome/gnome-keyring_2.20.bb b/meta/packages/gnome/gnome-keyring_2.20.bb
index c18d9f19f4..fb0f641a42 100644
--- a/meta/packages/gnome/gnome-keyring_2.20.bb
+++ b/meta/packages/gnome/gnome-keyring_2.20.bb
@@ -3,7 +3,7 @@ SECTION = "x11/gnome"
3 3
4PR = "r1" 4PR = "r1"
5 5
6inherit autotools gnome pkgconfig 6inherit autotools_stage gnome pkgconfig
7 7
8DEPENDS = "gtk+ libgcrypt" 8DEPENDS = "gtk+ libgcrypt"
9 9
@@ -17,7 +17,3 @@ do_install_append () {
17} 17}
18 18
19FILES_${PN} += "${datadir}/dbus-1/services" 19FILES_${PN} += "${datadir}/dbus-1/services"
20
21do_stage() {
22 autotools_stage_all
23}
diff --git a/meta/packages/gsm/gsmd.inc b/meta/packages/gsm/gsmd.inc
index 5e59bd660c..6039d6133d 100644
--- a/meta/packages/gsm/gsmd.inc
+++ b/meta/packages/gsm/gsmd.inc
@@ -13,7 +13,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
13 file://default" 13 file://default"
14S = "${WORKDIR}/gsm" 14S = "${WORKDIR}/gsm"
15 15
16inherit autotools pkgconfig update-rc.d 16inherit autotools_stage pkgconfig update-rc.d
17# handle update-rc.d RDEPENDS manually, we don't need it on 17# handle update-rc.d RDEPENDS manually, we don't need it on
18# anything but gsmd 18# anything but gsmd
19RDEPENDS_append = "" 19RDEPENDS_append = ""
@@ -21,10 +21,6 @@ RDEPENDS_append = ""
21INITSCRIPT_NAME = "gsmd" 21INITSCRIPT_NAME = "gsmd"
22INITSCRIPT_PARAMS = "defaults 35" 22INITSCRIPT_PARAMS = "defaults 35"
23 23
24do_stage() {
25 autotools_stage_all
26}
27
28do_install_append() { 24do_install_append() {
29 install -d ${D}/${sysconfdir}/init.d 25 install -d ${D}/${sysconfdir}/init.d
30 install -m 0755 ${WORKDIR}/gsmd ${D}/${sysconfdir}/init.d/ 26 install -m 0755 ${WORKDIR}/gsmd ${D}/${sysconfdir}/init.d/
diff --git a/meta/packages/gstreamer/gst-plugins.inc b/meta/packages/gstreamer/gst-plugins.inc
index 85775391ea..94cb9310d7 100644
--- a/meta/packages/gstreamer/gst-plugins.inc
+++ b/meta/packages/gstreamer/gst-plugins.inc
@@ -3,7 +3,7 @@ SECTION = "multimedia"
3PRIORITY = "optional" 3PRIORITY = "optional"
4DEPENDS = "gstreamer" 4DEPENDS = "gstreamer"
5 5
6inherit autotools pkgconfig 6inherit autotools_stage pkgconfig
7 7
8SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" 8SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2"
9 9
@@ -27,8 +27,4 @@ python populate_packages_prepend () {
27 do_split_packages(d, gst_libdir, 'libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)', extra_depends=bb.data.expand('${PN}-dev',d)) 27 do_split_packages(d, gst_libdir, 'libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)', extra_depends=bb.data.expand('${PN}-dev',d))
28} 28}
29 29
30do_stage() {
31 autotools_stage_all
32}
33
34ALLOW_EMPTY = "1" 30ALLOW_EMPTY = "1"
diff --git a/meta/packages/gstreamer/gstreamer_0.10.20.bb b/meta/packages/gstreamer/gstreamer_0.10.20.bb
index 32f6523b2a..512df0b4bd 100644
--- a/meta/packages/gstreamer/gstreamer_0.10.20.bb
+++ b/meta/packages/gstreamer/gstreamer_0.10.20.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.gstreamer.net/"
7DEPENDS = "glib-2.0 gettext-native libxml2 bison-native flex-native" 7DEPENDS = "glib-2.0 gettext-native libxml2 bison-native flex-native"
8PR = "r1" 8PR = "r1"
9 9
10inherit autotools pkgconfig 10inherit autotools_stage pkgconfig
11 11
12SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ 12SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
13 file://gst-inspect-check-error.patch;patch=1 \ 13 file://gst-inspect-check-error.patch;patch=1 \
@@ -26,10 +26,6 @@ do_configure_prepend() {
26 26
27PARALLEL_MAKE = "" 27PARALLEL_MAKE = ""
28 28
29do_stage() {
30 autotools_stage_all
31}
32
33FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so" 29FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
34FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" 30FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
35FILES_${PN}-dbg += " ${libdir}/gstreamer-0.10/.debug/" 31FILES_${PN}-dbg += " ${libdir}/gstreamer-0.10/.debug/"
diff --git a/meta/packages/gupnp/gssdp_0.6.2.bb b/meta/packages/gupnp/gssdp_0.6.2.bb
index 034d2f5fe3..09e12e2c63 100644
--- a/meta/packages/gupnp/gssdp_0.6.2.bb
+++ b/meta/packages/gupnp/gssdp_0.6.2.bb
@@ -3,12 +3,8 @@ DEPENDS = "glib-2.0 libsoup-2.4 libglade"
3 3
4SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz" 4SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz"
5 5
6inherit autotools pkgconfig 6inherit autotools_stage pkgconfig
7 7
8PACKAGES =+ "gssdp-tools" 8PACKAGES =+ "gssdp-tools"
9 9
10FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade" 10FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade"
11
12do_stage() {
13 autotools_stage_all
14}
diff --git a/meta/packages/gupnp/gupnp_0.12.2.bb b/meta/packages/gupnp/gupnp_0.12.2.bb
index e1a0206d90..2b615f0602 100644
--- a/meta/packages/gupnp/gupnp_0.12.2.bb
+++ b/meta/packages/gupnp/gupnp_0.12.2.bb
@@ -3,12 +3,7 @@ DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2"
3 3
4SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz" 4SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz"
5 5
6inherit autotools pkgconfig 6inherit autotools_stage pkgconfig
7
8do_stage() {
9 autotools_stage_all
10}
11
12 7
13FILES_${PN} = "${libdir}/*.so.*" 8FILES_${PN} = "${libdir}/*.so.*"
14FILES_${PN}-dev += "${bindir}/gupnp-binding-tool" 9FILES_${PN}-dev += "${bindir}/gupnp-binding-tool"
diff --git a/meta/packages/gypsy/gypsy.inc b/meta/packages/gypsy/gypsy.inc
index 456d9fb6a5..82978029c8 100644
--- a/meta/packages/gypsy/gypsy.inc
+++ b/meta/packages/gypsy/gypsy.inc
@@ -3,7 +3,7 @@ LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4DEPENDS = "glib-2.0 dbus bluez-libs dbus-glib" 4DEPENDS = "glib-2.0 dbus bluez-libs dbus-glib"
5 5
6inherit autotools pkgconfig 6inherit autotools_stage pkgconfig
7 7
8EXTRA_OECONF += "--with-distro=debian" 8EXTRA_OECONF += "--with-distro=debian"
9 9
diff --git a/meta/packages/gypsy/gypsy_0.6.bb b/meta/packages/gypsy/gypsy_0.6.bb
index 68a07ffcd7..4301e8275d 100644
--- a/meta/packages/gypsy/gypsy_0.6.bb
+++ b/meta/packages/gypsy/gypsy_0.6.bb
@@ -5,6 +5,6 @@ DEPENDS = "glib-2.0 dbus bluez-libs dbus-glib libxslt"
5 5
6SRC_URI = "http://gypsy.freedesktop.org/gypsy-releases/gypsy-${PV}.tar.gz" 6SRC_URI = "http://gypsy.freedesktop.org/gypsy-releases/gypsy-${PV}.tar.gz"
7 7
8inherit autotools pkgconfig 8inherit autotools_stage pkgconfig
9 9
10FILES_${PN} += "/usr/share/dbus-1/services/" 10FILES_${PN} += "/usr/share/dbus-1/services/"
diff --git a/meta/packages/icu/icu-3.6.inc b/meta/packages/icu/icu-3.6.inc
index 04fc8420ab..1c7eda21e2 100644
--- a/meta/packages/icu/icu-3.6.inc
+++ b/meta/packages/icu/icu-3.6.inc
@@ -7,7 +7,7 @@ S = "${WORKDIR}/icu/source"
7 7
8PARALLEL_MAKE = "" 8PARALLEL_MAKE = ""
9 9
10inherit autotools pkgconfig binconfig 10inherit autotools_stage pkgconfig binconfig
11 11
12do_configure() { 12do_configure() {
13 libtoolize --force 13 libtoolize --force
diff --git a/meta/packages/icu/icu_3.6.bb b/meta/packages/icu/icu_3.6.bb
index 5760ddb2bc..5b341470ff 100644
--- a/meta/packages/icu/icu_3.6.bb
+++ b/meta/packages/icu/icu_3.6.bb
@@ -34,8 +34,4 @@ FILES_libiculx = "${libdir}/libiculx.so.*"
34FILES_libicutu = "${libdir}/libicutu.so.*" 34FILES_libicutu = "${libdir}/libicutu.so.*"
35FILES_libicuio = "${libdir}/libicuio.so.*" 35FILES_libicuio = "${libdir}/libicuio.so.*"
36 36
37do_stage() {
38 autotools_stage_all
39}
40
41 37
diff --git a/meta/packages/iso-codes/iso-codes_3.3.bb b/meta/packages/iso-codes/iso-codes_3.3.bb
index 98425111d5..50ea791926 100644
--- a/meta/packages/iso-codes/iso-codes_3.3.bb
+++ b/meta/packages/iso-codes/iso-codes_3.3.bb
@@ -7,13 +7,8 @@ PACKAGE_ARCH = "all"
7 7
8SRC_URI = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-${PV}.tar.gz" 8SRC_URI = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-${PV}.tar.gz"
9 9
10inherit autotools 10inherit autotools_stage
11 11
12FILES_${PN}-dev="${datadir}/pkgconfig/iso-codes.pc" 12FILES_${PN}-dev="${datadir}/pkgconfig/iso-codes.pc"
13FILES_${PN}="${datadir}/xml/iso-codes/ \ 13FILES_${PN}="${datadir}/xml/iso-codes/ \
14 ${datadir}/iso-codes/" 14 ${datadir}/iso-codes/"
15
16do_stage() {
17 autotools_stage_all
18}
19
diff --git a/meta/packages/libetpan/libetpan_0.54.bb b/meta/packages/libetpan/libetpan_0.54.bb
index 7ad0f54f2c..6a20560c07 100644
--- a/meta/packages/libetpan/libetpan_0.54.bb
+++ b/meta/packages/libetpan/libetpan_0.54.bb
@@ -9,15 +9,11 @@ PR = "r1"
9SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \ 9SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
10 file://cxx-is-here.patch;patch=1" 10 file://cxx-is-here.patch;patch=1"
11 11
12inherit autotools pkgconfig gettext binconfig 12inherit autotools_stage pkgconfig gettext binconfig
13 13
14EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db" 14EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db"
15 15
16PARALLEL_MAKE = "" 16PARALLEL_MAKE = ""
17 17
18do_stage() {
19 autotools_stage_all
20}
21
22FILES_${PN} = "${libdir}/lib*.so.*" 18FILES_${PN} = "${libdir}/lib*.so.*"
23FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig" 19FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
diff --git a/meta/packages/libexif/libexif_0.6.16.bb b/meta/packages/libexif/libexif_0.6.16.bb
index 2f896352db..0be23df60b 100644
--- a/meta/packages/libexif/libexif_0.6.16.bb
+++ b/meta/packages/libexif/libexif_0.6.16.bb
@@ -5,14 +5,10 @@ LICENSE = "LGPL"
5 5
6SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2" 6SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2"
7 7
8inherit autotools 8inherit autotools_stage
9 9
10do_configure_append() { 10do_configure_append() {
11 sed -i s:doc\ binary:binary:g Makefile 11 sed -i s:doc\ binary:binary:g Makefile
12} 12}
13 13
14AUTOTOOLS_STAGE_PKGCONFIG = "1" 14AUTOTOOLS_STAGE_PKGCONFIG = "1"
15
16do_stage() {
17 autotools_stage_all
18}
diff --git a/meta/packages/libgcrypt/libgcrypt.inc b/meta/packages/libgcrypt/libgcrypt.inc
index 5fe2b49121..ccbb4b7066 100644
--- a/meta/packages/libgcrypt/libgcrypt.inc
+++ b/meta/packages/libgcrypt/libgcrypt.inc
@@ -7,16 +7,12 @@ DEPENDS = "libgpg-error"
7SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \ 7SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
8 file://add-pkgconfig-support.patch;patch=1" 8 file://add-pkgconfig-support.patch;patch=1"
9 9
10inherit autotools binconfig pkgconfig 10inherit autotools_stage binconfig pkgconfig
11 11
12EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" 12EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
13 13
14ARM_INSTRUCTION_SET = "arm" 14ARM_INSTRUCTION_SET = "arm"
15 15
16do_stage() {
17 autotools_stage_all
18}
19
20# move libgcrypt-config into -dev package 16# move libgcrypt-config into -dev package
21FILES_${PN} = "${libdir}/lib*.so.*" 17FILES_${PN} = "${libdir}/lib*.so.*"
22FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig/*.pc" 18FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig/*.pc"
diff --git a/meta/packages/libgdbus/libgdbus_git.bb b/meta/packages/libgdbus/libgdbus_git.bb
index 30cffe3997..d29afa546c 100644
--- a/meta/packages/libgdbus/libgdbus_git.bb
+++ b/meta/packages/libgdbus/libgdbus_git.bb
@@ -7,8 +7,4 @@ S = "${WORKDIR}/git"
7 7
8SRC_URI = "git://moblin.org/repos/projects/libgdbus.git;protocol=http" 8SRC_URI = "git://moblin.org/repos/projects/libgdbus.git;protocol=http"
9 9
10inherit autotools pkgconfig 10inherit autotools_stage pkgconfig
11
12do_stage() {
13 autotools_stage_all
14}
diff --git a/meta/packages/wbxml/wbxml2_0.9.2.bb b/meta/packages/wbxml/wbxml2_0.9.2.bb
index 85b533044d..14c3f6acc3 100644
--- a/meta/packages/wbxml/wbxml2_0.9.2.bb
+++ b/meta/packages/wbxml/wbxml2_0.9.2.bb
@@ -6,17 +6,13 @@ DEPENDS = "libxml2 sed-native expat"
6SRC_URI = "${SOURCEFORGE_MIRROR}/wbxmllib/${P}.tar.gz \ 6SRC_URI = "${SOURCEFORGE_MIRROR}/wbxmllib/${P}.tar.gz \
7 file://no-doc-install.patch;patch=1" 7 file://no-doc-install.patch;patch=1"
8 8
9inherit autotools pkgconfig 9inherit autotools_stage pkgconfig
10 10
11do_configure_append() { 11do_configure_append() {
12 sed -i s:-I/usr/include::g Makefile 12 sed -i s:-I/usr/include::g Makefile
13 sed -i s:-I/usr/include::g */Makefile 13 sed -i s:-I/usr/include::g */Makefile
14} 14}
15 15
16do_stage() {
17 autotools_stage_all
18}
19
20PACKAGES += "${PN}-tools" 16PACKAGES += "${PN}-tools"
21 17
22FILES_${PN}-tools = "${bindir}" 18FILES_${PN}-tools = "${bindir}"
diff --git a/meta/packages/webkit/webkit-gtk_svn.bb b/meta/packages/webkit/webkit-gtk_svn.bb
index 3dd7f13029..a5765e84b1 100644
--- a/meta/packages/webkit/webkit-gtk_svn.bb
+++ b/meta/packages/webkit/webkit-gtk_svn.bb
@@ -23,7 +23,7 @@ SRC_URI = "\
23 23
24S = "${WORKDIR}/" 24S = "${WORKDIR}/"
25 25
26inherit autotools pkgconfig 26inherit autotools_stage pkgconfig
27 27
28EXTRA_OECONF = "\ 28EXTRA_OECONF = "\
29 --enable-debug=no \ 29 --enable-debug=no \
@@ -48,10 +48,6 @@ do_compile_prepend() {
48 cd ${S} 48 cd ${S}
49} 49}
50 50
51do_stage() {
52 autotools_stage_all
53}
54
55PACKAGES =+ "${PN}launcher-dbg ${PN}launcher libjavascriptcore" 51PACKAGES =+ "${PN}launcher-dbg ${PN}launcher libjavascriptcore"
56FILES_${PN}launcher = "${bindir}/GtkLauncher" 52FILES_${PN}launcher = "${bindir}/GtkLauncher"
57FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher" 53FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher"
diff --git a/meta/packages/wv/wv_1.2.0.bb b/meta/packages/wv/wv_1.2.0.bb
index 7f06f587c4..6fdb0fe8c6 100644
--- a/meta/packages/wv/wv_1.2.0.bb
+++ b/meta/packages/wv/wv_1.2.0.bb
@@ -7,12 +7,8 @@ PR = "r3"
7SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \ 7SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \
8 file://pkgconfig.patch;patch=1" 8 file://pkgconfig.patch;patch=1"
9 9
10inherit autotools pkgconfig 10inherit autotools_stage pkgconfig
11 11
12S = "${WORKDIR}/${PN}-${PV}" 12S = "${WORKDIR}/${PN}-${PV}"
13 13
14EXTRA_OECONF = "" 14EXTRA_OECONF = ""
15
16do_stage () {
17 autotools_stage_all
18}
diff --git a/meta/packages/xcb/libpthread-stubs_0.1.bb b/meta/packages/xcb/libpthread-stubs_0.1.bb
index 211170a902..826bff7678 100644
--- a/meta/packages/xcb/libpthread-stubs_0.1.bb
+++ b/meta/packages/xcb/libpthread-stubs_0.1.bb
@@ -11,11 +11,7 @@ PARALLEL_MAKE = ""
11 11
12SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2" 12SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2"
13 13
14inherit autotools pkgconfig 14inherit autotools_stage pkgconfig
15
16do_stage() {
17 autotools_stage_all
18}
19 15
20RDEPENDS_${PN}-dev = "" 16RDEPENDS_${PN}-dev = ""
21RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" 17RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})"
diff --git a/meta/packages/xcb/libxcb.inc b/meta/packages/xcb/libxcb.inc
index bdce8a2e6b..ee46f598c0 100644
--- a/meta/packages/xcb/libxcb.inc
+++ b/meta/packages/xcb/libxcb.inc
@@ -40,7 +40,7 @@ FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*"
40FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*" 40FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*"
41FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*" 41FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*"
42 42
43inherit autotools pkgconfig 43inherit autotools_stage pkgconfig
44 44
45# XCBPROTO_XCBINCLUDEDIR is setup based on `pkg-config --variable=xcbincludedir xcb-proto` 45# XCBPROTO_XCBINCLUDEDIR is setup based on `pkg-config --variable=xcbincludedir xcb-proto`
46# but the xcbincludedir variable doesn't point into the staging area, so it needs some 46# but the xcbincludedir variable doesn't point into the staging area, so it needs some
@@ -49,7 +49,3 @@ do_configure_prepend () {
49 sed -i "s|XCBPROTO_XCBINCLUDEDIR=|XCBPROTO_XCBINCLUDEDIR=${STAGING_DIR_HOST}/|" \ 49 sed -i "s|XCBPROTO_XCBINCLUDEDIR=|XCBPROTO_XCBINCLUDEDIR=${STAGING_DIR_HOST}/|" \
50 ${S}/configure.ac 50 ${S}/configure.ac
51} 51}
52
53do_stage() {
54 autotools_stage_all
55}
diff --git a/meta/packages/xkeyboard-config/xkeyboard-config_1.3.bb b/meta/packages/xkeyboard-config/xkeyboard-config_1.3.bb
index cb448be243..19a08d7a31 100644
--- a/meta/packages/xkeyboard-config/xkeyboard-config_1.3.bb
+++ b/meta/packages/xkeyboard-config/xkeyboard-config_1.3.bb
@@ -6,11 +6,7 @@ PR = "r2"
6 6
7SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2" 7SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2"
8 8
9inherit autotools 9inherit autotools_stage
10
11do_stage() {
12 autotools_stage_all
13}
14 10
15do_install_append () { 11do_install_append () {
16 install -d ${D}/usr/share/X11/xkb/compiled 12 install -d ${D}/usr/share/X11/xkb/compiled
diff --git a/meta/packages/xorg-app/xorg-app-common.inc b/meta/packages/xorg-app/xorg-app-common.inc
index cd7f654be2..2dc659a0fa 100644
--- a/meta/packages/xorg-app/xorg-app-common.inc
+++ b/meta/packages/xorg-app/xorg-app-common.inc
@@ -10,10 +10,6 @@ SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2"
10 10
11S = "${WORKDIR}/${XORG_PN}-${PV}" 11S = "${WORKDIR}/${XORG_PN}-${PV}"
12 12
13inherit autotools pkgconfig 13inherit autotools_stage pkgconfig
14
15do_stage() {
16 autotools_stage_all
17}
18 14
19FILES_${PN} += " /usr/lib/X11/${XORG_PN}" 15FILES_${PN} += " /usr/lib/X11/${XORG_PN}"
diff --git a/meta/packages/xorg-driver/xf86-driver-common.inc b/meta/packages/xorg-driver/xf86-driver-common.inc
index 308d06e0b1..3cb8cd021e 100644
--- a/meta/packages/xorg-driver/xf86-driver-common.inc
+++ b/meta/packages/xorg-driver/xf86-driver-common.inc
@@ -16,11 +16,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
16FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" 16FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so"
17FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug" 17FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"
18 18
19inherit autotools pkgconfig 19inherit autotools_stage pkgconfig
20
21do_stage() {
22 autotools_stage_all
23}
24 20
25# AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement 21# AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement
26# macro that simply assumes the test succeeds. 22# macro that simply assumes the test succeeds.
diff --git a/meta/packages/xorg-lib/xorg-lib-common.inc b/meta/packages/xorg-lib/xorg-lib-common.inc
index eae0e92a8d..66b453f67f 100644
--- a/meta/packages/xorg-lib/xorg-lib-common.inc
+++ b/meta/packages/xorg-lib/xorg-lib-common.inc
@@ -9,10 +9,6 @@ SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2"
9 9
10S = "${WORKDIR}/${XORG_PN}-${PV}" 10S = "${WORKDIR}/${XORG_PN}-${PV}"
11 11
12inherit autotools pkgconfig 12inherit autotools_stage pkgconfig
13 13
14EXTRA_OECONF = "--enable-malloc0returnsnull" 14EXTRA_OECONF = "--enable-malloc0returnsnull"
15
16do_stage() {
17 autotools_stage_all
18}
diff --git a/meta/packages/xorg-proto/xorg-proto-common.inc b/meta/packages/xorg-proto/xorg-proto-common.inc
index c7188a766a..e70afd02bf 100644
--- a/meta/packages/xorg-proto/xorg-proto-common.inc
+++ b/meta/packages/xorg-proto/xorg-proto-common.inc
@@ -9,12 +9,8 @@ SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-${PV}.tar.bz2"
9 9
10S = "${WORKDIR}/${XORG_PN}-${PV}" 10S = "${WORKDIR}/${XORG_PN}-${PV}"
11 11
12inherit autotools pkgconfig 12inherit autotools_stage pkgconfig
13 13
14# ${PN} is empty so we need to tweak -dev and -dbg package dependencies 14# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
15RDEPENDS_${PN}-dev = "" 15RDEPENDS_${PN}-dev = ""
16RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" 16RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})"
17
18do_stage() {
19 autotools_stage_all
20}
diff --git a/meta/packages/xorg-util/xorg-util-common.inc b/meta/packages/xorg-util/xorg-util-common.inc
index 56aae30725..e8a9d01d15 100644
--- a/meta/packages/xorg-util/xorg-util-common.inc
+++ b/meta/packages/xorg-util/xorg-util-common.inc
@@ -8,8 +8,4 @@ SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-${PV}.tar.gz"
8 8
9S = "${WORKDIR}/${XORG_PN}-${PV}" 9S = "${WORKDIR}/${XORG_PN}-${PV}"
10 10
11inherit autotools pkgconfig 11inherit autotools_stage pkgconfig
12
13do_stage() {
14 autotools_stage_all
15}
diff --git a/meta/packages/xorg-xserver/xserver-xf86-common.inc b/meta/packages/xorg-xserver/xserver-xf86-common.inc
index d31e97a0e2..5a10ecf994 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-common.inc
+++ b/meta/packages/xorg-xserver/xserver-xf86-common.inc
@@ -16,7 +16,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \
16 16
17S = "${WORKDIR}/${XORG_PN}-${PV}" 17S = "${WORKDIR}/${XORG_PN}-${PV}"
18 18
19inherit autotools pkgconfig 19inherit autotools_stage pkgconfig
20 20
21PACKAGES =+ "${PN}-utils" 21PACKAGES =+ "${PN}-utils"
22 22
@@ -33,10 +33,6 @@ CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf"
33 33
34SRC_URI += "file://macro_tweak.patch;patch=1" 34SRC_URI += "file://macro_tweak.patch;patch=1"
35 35
36do_stage() {
37 autotools_stage_all
38}
39
40do_install_append () { 36do_install_append () {
41 install -d ${D}/${sysconfdir}/X11 37 install -d ${D}/${sysconfdir}/X11
42 install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ 38 install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-20 06:01:22 +0000