diff options
63 files changed, 106 insertions, 153 deletions
diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass index 18aee09a26..fa34565eaf 100644 --- a/classes/distutils.bbclass +++ b/classes/distutils.bbclass @@ -13,16 +13,15 @@ distutils_do_compile() { } distutils_stage_headers() { - install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages + install -d ${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ oefatal "python setup.py install_headers execution failed." } distutils_stage_all() { - install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages - # is this missing a lib below? - PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \ + install -d ${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages + PYTHONPATH=${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ oefatal "python setup.py install (stage) execution failed." diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index 1a3622c3bb..22b6166685 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -28,7 +28,7 @@ python do_package_deb_install () { pkgfn = bb.data.getVar('PKGFN', d, 1) rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1) debdir = bb.data.getVar('DEPLOY_DIR_DEB', d, 1) - stagingdir = bb.data.getVar('STAGING_DIR', d, 1) + apt_config = bb.data.expand('${STAGING_ETCDIR_NATIVE}/apt/apt.conf', d) stagingbindir = bb.data.getVar('STAGING_BINDIR_NATIVE', d, 1) tmpdir = bb.data.getVar('TMPDIR', d, 1) @@ -55,7 +55,7 @@ python do_package_deb_install () { # Set up environment apt_config_backup = os.getenv('APT_CONFIG') - os.putenv('APT_CONFIG', os.path.join(stagingdir, 'etc', 'apt', 'apt.conf')) + os.putenv('APT_CONFIG', apt_config) path = os.getenv('PATH') os.putenv('PATH', '%s:%s' % (stagingbindir, os.getenv('PATH'))) diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass index c2c4a764e4..5237285e4c 100644 --- a/classes/rootfs_deb.bbclass +++ b/classes/rootfs_deb.bbclass @@ -10,12 +10,8 @@ fakeroot rootfs_deb_do_rootfs () { mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info mkdir -p ${IMAGE_ROOTFS}/var/dpkg/updates - mkdir -p ${STAGING_ETCDIR_NATIVE}/apt/ - rm -f ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences - > ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev - > ${STAGING_ETCDIR_NATIVE}/apt/preferences > ${IMAGE_ROOTFS}/var/dpkg/status > ${IMAGE_ROOTFS}/var/dpkg/available # > ${STAGING_DIR}/var/dpkg/status @@ -40,9 +36,9 @@ fakeroot rootfs_deb_do_rootfs () { priority=$(expr $priority + 5) done - tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_DIR}/etc/apt/sources.list + tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_ETCDIR_NATIVE}/apt/sources.list - cat "${STAGING_DIR}/etc/apt/apt.conf.sample" \ + cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \ | sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \ > "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf" diff --git a/packages/apt/apt-native_0.6.46.2.bb b/packages/apt/apt-native_0.6.46.2.bb index 43f73889f7..3342618aa9 100644 --- a/packages/apt/apt-native_0.6.46.2.bb +++ b/packages/apt/apt-native_0.6.46.2.bb @@ -1,4 +1,5 @@ require apt-native.inc +PR = "r1" SRC_URI += "file://nodoc.patch;patch=1 \ file://noconfigure.patch;patch=1" diff --git a/packages/apt/apt-native_0.7.2.bb b/packages/apt/apt-native_0.7.2.bb index 3342618aa9..6db567f987 100644 --- a/packages/apt/apt-native_0.7.2.bb +++ b/packages/apt/apt-native_0.7.2.bb @@ -1,5 +1,5 @@ require apt-native.inc -PR = "r1" +PR = "r2" SRC_URI += "file://nodoc.patch;patch=1 \ file://noconfigure.patch;patch=1" diff --git a/packages/apt/apt-native_0.7.3.bb b/packages/apt/apt-native_0.7.3.bb index 6db567f987..7bf69c01af 100644 --- a/packages/apt/apt-native_0.7.3.bb +++ b/packages/apt/apt-native_0.7.3.bb @@ -1,5 +1,5 @@ require apt-native.inc -PR = "r2" +PR = "r3" SRC_URI += "file://nodoc.patch;patch=1 \ file://noconfigure.patch;patch=1" diff --git a/packages/apt/files/apt.conf b/packages/apt/files/apt.conf index 9e90616465..2bd9ddbfaf 100644 --- a/packages/apt/files/apt.conf +++ b/packages/apt/files/apt.conf @@ -1,4 +1,4 @@ -Dir "${STAGING_DIR}/" +Dir "${STAGING_DIR_NATIVE}/" { State "var/lib/apt/" { diff --git a/packages/ark3116/ark3116_0.4.1.bb b/packages/ark3116/ark3116_0.4.1.bb index 89bcfa85d9..629c50a3ca 100644 --- a/packages/ark3116/ark3116_0.4.1.bb +++ b/packages/ark3116/ark3116_0.4.1.bb @@ -25,8 +25,8 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" +export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \ + -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir}" do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/serial diff --git a/packages/avr-libc/avr-libc_1.0.3.bb b/packages/avr-libc/avr-libc_1.0.3.bb index 1c627a1576..20a2850958 100644 --- a/packages/avr-libc/avr-libc_1.0.3.bb +++ b/packages/avr-libc/avr-libc_1.0.3.bb @@ -22,12 +22,13 @@ prefix = "${CROSS_DIR}" exec_prefix = "${prefix}" do_stage () { -# install into CROSS_DIR + # install into CROSS_DIR oe_runmake install -# install into STAGING_DIR - oe_runmake "prefix=${STAGING_DIR}" "exec_prefix=${STAGING_DIR}" \ + # install into staging + oe_runmake "prefix=${STAGING_DIR_HOST}${layout_prefix}" \ + "exec_prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" \ "bindir=${STAGING_BINDIR}" "libdir=${STAGING_LIBDIR}" \ - "tooldir=${STAGING_DIR}" "toolibdir=${STAGING_LIBDIR}" \ + "tooldir=${STAGING_DIR_HOST}" "toolibdir=${STAGING_LIBDIR}" \ install } diff --git a/packages/cairo/libsvg-cairo_0.1.5.bb b/packages/cairo/libsvg-cairo_0.1.5.bb index 9cee27bf29..add660752a 100644 --- a/packages/cairo/libsvg-cairo_0.1.5.bb +++ b/packages/cairo/libsvg-cairo_0.1.5.bb @@ -9,5 +9,5 @@ SRC_URI = "http://cairographics.org/snapshots/libsvg-cairo-${PV}.tar.gz" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/packages/cairo/libsvg-cairo_0.1.6.bb b/packages/cairo/libsvg-cairo_0.1.6.bb index 9cee27bf29..add660752a 100644 --- a/packages/cairo/libsvg-cairo_0.1.6.bb +++ b/packages/cairo/libsvg-cairo_0.1.6.bb @@ -9,5 +9,5 @@ SRC_URI = "http://cairographics.org/snapshots/libsvg-cairo-${PV}.tar.gz" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/packages/cairo/xsvg_cvs.bb b/packages/cairo/xsvg_cvs.bb index 8f4f4bfdc4..210898f576 100644 --- a/packages/cairo/xsvg_cvs.bb +++ b/packages/cairo/xsvg_cvs.bb @@ -14,5 +14,5 @@ BROKEN = "1" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/packages/callweaver/callweaver_1.2.0-rc5.bb b/packages/callweaver/callweaver_1.2.0-rc5.bb index 608181f96c..32869936b6 100644 --- a/packages/callweaver/callweaver_1.2.0-rc5.bb +++ b/packages/callweaver/callweaver_1.2.0-rc5.bb @@ -29,9 +29,9 @@ INITSCRIPT_PARAMS = "defaults 60" inherit autotools update-rc.d -EXTRA_OECONF = " --with-ssl=${STAGING_DIR}/${HOST_SYS} --enable-low_memory \ +EXTRA_OECONF = " --with-ssl=${STAGING_DIR_HOST}${layout_exec_prefix} --enable-low_memory \ --disable-zaptel --with-directory-layout=lsb --enable-t38 \ - --with-codec-speex=${STAGING_DIR}/${HOST_SYS} \ + --with-codec-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \ --with-perl-shebang='#!${bindir}/perl' --with-jabber --with-res_jabber \ --with-javascript --with-res_js \ --bindir=${bindir} --datadir=${datadir} --sysconfdir=${sysconfdir} \ diff --git a/packages/dejagnu/dejagnu-qemu_1.0.bb b/packages/dejagnu/dejagnu-qemu_1.0.bb index 7230f985f6..2eef27e9a3 100644 --- a/packages/dejagnu/dejagnu-qemu_1.0.bb +++ b/packages/dejagnu/dejagnu-qemu_1.0.bb @@ -13,7 +13,7 @@ do_stage() { install -m 0644 ${WORKDIR}/arm-qemu.exp ${STAGING_DATADIR}/dejagnu/baseboards/ cat <<EOF >${STAGING_BINDIR_NATIVE}/${QEMU}-test-wrapper #!/bin/sh -exec ${QEMU} ${CROSS_DIR}/${TARGET_SYS}/${LD_SO} --library-path ${CROSS_DIR}/${TARGET_SYS}/lib:${STAGING_DIR}/${TARGET_SYS}/lib \$1 +exec ${QEMU} ${CROSS_DIR}/${TARGET_SYS}/${LD_SO} --library-path ${CROSS_DIR}/${TARGET_SYS}/lib:${STAGING_DIR_TARGET}${layout_libdir} \$1 EOF chmod 755 ${STAGING_BINDIR_NATIVE}/arm-qemu-test-wrapper } diff --git a/packages/dtnrg/dtn_2.5.0.bb b/packages/dtnrg/dtn_2.5.0.bb index 5975a29e7c..3878829ce5 100644 --- a/packages/dtnrg/dtn_2.5.0.bb +++ b/packages/dtnrg/dtn_2.5.0.bb @@ -3,29 +3,30 @@ HOMEPAGE = "http://www.dtnrg.org/wiki" SECTION = "libs" DEPENDS = "db openssl python-native xerces-c" LICENSE = "Apache" -SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz" -PR = "r2" +SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz \ + file://configure_fix.patch;patch=1" +PR = "r3" inherit autotools EXTRA_OECONF = "\ --with-python=${STAGING_BINDIR_NATIVE}/python \ - --with-db=${STAGING_DIR} \ - --with-tcl=${STAGING_DIR} \ + --with-db=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-tcl=${STAGING_DIR_HOST}${layout_exec_prefix} \ --without-google-perftools \ --without-bluez \ --without-bonjour \ - --with-expat=${STAGING_DIR} \ - --with-xerces-c=${STAGING_DIR} \ + --with-expat=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-xerces-c=${STAGING_DIR_HOST}${layout_exec_prefix} \ --without-tclreadline \ - --with-zlib=${STAGING_DIR} \ + --with-zlib=${STAGING_DIR_HOST}${layout_exec_prefix} \ --without-xsd-tool \ - --with-db=${STAGING_DIR} \ + --with-db=${STAGING_DIR_HOST}${layout_exec_prefix} \ --enable-ecl \ --enable-edp \ --without-mysql \ --without-postgres \ - --with-openssl=${STAGING_DIR} \ + --with-openssl=${STAGING_DIR_HOST}${layout_exec_prefix} \ " def dtn_python_dir(d): diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb index e8f263d1a9..4a406d6516 100644 --- a/packages/emacs/emacs_cvs.bb +++ b/packages/emacs/emacs_cvs.bb @@ -26,7 +26,7 @@ FILES_${PN}-el = "${datadir}/emacs/*/*/*.el.gz \ FILES_${PN} += "${datadir}/emacs" -QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR}/${TARGET_SYS}" +QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR_TARGET}" LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib" EXTRA_OECONF = "--without-sound --without-x" diff --git a/packages/enca/enca_1.9.bb b/packages/enca/enca_1.9.bb index ddd7acef82..548a824523 100644 --- a/packages/enca/enca_1.9.bb +++ b/packages/enca/enca_1.9.bb @@ -13,7 +13,7 @@ SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-${PV} inherit autotools -EXTRA_OECONF="--with-libiconv-prefix=${STAGING_DIR}" +EXTRA_OECONF="--with-libiconv-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" do_configure_append() { sed -i s:-I/usr/include::g Makefile diff --git a/packages/erlang/erlang_R11B.1.bb b/packages/erlang/erlang_R11B.1.bb index 4c754f6c3e..e85a297ff9 100644 --- a/packages/erlang/erlang_R11B.1.bb +++ b/packages/erlang/erlang_R11B.1.bb @@ -11,7 +11,7 @@ SRC_URI += "file://erts-configure.in.patch;patch=1 \ EXTRA_OEMAKE = "BUILD_CC='${BUILD_CC}'" -EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${HOST_SYS}" +EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${layout_exec_prefix}" EXTRA_OECONF_append_arm = " --disable-smp-support --disable-hipe" EXTRA_OECONF_append_armeb = " --disable-smp-support --disable-hipe" diff --git a/packages/fltk/efltk_2.0.7.bb b/packages/fltk/efltk_2.0.7.bb index 57737e1c57..b048e078b3 100644 --- a/packages/fltk/efltk_2.0.7.bb +++ b/packages/fltk/efltk_2.0.7.bb @@ -40,11 +40,7 @@ do_configure_append() { } do_stage() { - oe_runmake install prefix="${STAGING_DIR}" \ - bindir="${STAGING_BINDIR}" \ - includedir="${STAGING_INCDIR}" \ - libdir="${STAGING_LIBDIR}" \ - datadir="${STAGING_DATADIR}" + autotools_stage_all } do_install () { diff --git a/packages/fltk/fltk_1.1.4.bb b/packages/fltk/fltk_1.1.4.bb index 66c4b214ec..ae7c0e1c95 100644 --- a/packages/fltk/fltk_1.1.4.bb +++ b/packages/fltk/fltk_1.1.4.bb @@ -21,11 +21,7 @@ do_configure() { } do_install () { - oe_runmake prefix="${D}${prefix}" \ - bindir="${D}${bindir}" \ - libdir="${D}${libdir}" \ - includedir="${D}${includedir}" \ - install + autotools_stage_all } do_stage() { diff --git a/packages/fltk/fltk_1.1.7.bb b/packages/fltk/fltk_1.1.7.bb index 3e095b45a3..866db129e8 100644 --- a/packages/fltk/fltk_1.1.7.bb +++ b/packages/fltk/fltk_1.1.7.bb @@ -19,11 +19,7 @@ do_configure() { } do_stage() { - oe_runmake install prefix="${STAGING_DIR}" \ - bindir="${STAGING_BINDIR}" \ - includedir="${STAGING_INCDIR}" \ - libdir="${STAGING_LIBDIR}" \ - datadir="${STAGING_DATADIR}" + autotools_stage_all } do_install () { diff --git a/packages/fs/fs_cvs.bb b/packages/fs/fs_cvs.bb index 8e2724ce4b..b1d6ed4bea 100644 --- a/packages/fs/fs_cvs.bb +++ b/packages/fs/fs_cvs.bb @@ -10,9 +10,5 @@ S = "${WORKDIR}/FS" inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } diff --git a/packages/gcc/gcc_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb index 06cbbb23e4..1cfd085b27 100644 --- a/packages/gcc/gcc_4.2.2.bb +++ b/packages/gcc/gcc_4.2.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -PR = "r4" +PR = "r5" inherit autotools gettext diff --git a/packages/gpephone/linphone_1.5.0.bb b/packages/gpephone/linphone_1.5.0.bb index 5ce1c0b58c..631c2d7933 100644 --- a/packages/gpephone/linphone_1.5.0.bb +++ b/packages/gpephone/linphone_1.5.0.bb @@ -15,8 +15,8 @@ inherit autotools pkgconfig EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc --without-ffmpeg \ --without-sdl --disable-video --enable-alsa \ - --with-osip=${STAGING_DIR}/${HOST_SYS} \ - --with-readline=${STAGING_DIR}/${HOST_SYS} \ + --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \ --disable-truespeech --disable-manual \ --disable-glibtest --disable-glib --disable-strict" diff --git a/packages/gpgme/gpgme.inc b/packages/gpgme/gpgme.inc index dc8df2c85f..71cd68fa2b 100644 --- a/packages/gpgme/gpgme.inc +++ b/packages/gpgme/gpgme.inc @@ -5,7 +5,7 @@ DEPENDS = "libgpg-error pth libassuan" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.gz" -EXTRA_OECONF = "--with-pth=${STAGING_DIR}/${HOST_SYS} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm" +EXTRA_OECONF = "--with-pth=${STAGING_DIR_HOST}${layout_exec_prefix} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm" LEAD_SONAME = "libgpgme.so" diff --git a/packages/gtk+/gdk-pixbuf_2.10.14.bb b/packages/gtk+/gdk-pixbuf_2.10.14.bb index ecd2d51d49..7d3e7dc92a 100644 --- a/packages/gtk+/gdk-pixbuf_2.10.14.bb +++ b/packages/gtk+/gdk-pixbuf_2.10.14.bb @@ -73,7 +73,7 @@ do_compile() { do_stage() { oe_libinstall -C gdk-pixbuf -so libgdk_pixbuf-2.0 ${STAGING_LIBDIR} - cd gdk-pixbuf && oe_runmake install DESTDIR=${STAGING_DIR}/usr + cd gdk-pixbuf && oe_runmake install DESTDIR=${STAGING_DIR_HOST}${layout_exec_prefix} autotools_stage_includes # install -d -m 0755 ${STAGING_LIBDIR}/gtk-2.0/include # install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h diff --git a/packages/gtk+/gtk+-directfb_2.10.14.bb b/packages/gtk+/gtk+-directfb_2.10.14.bb index e77f24638d..6fcaf299dc 100644 --- a/packages/gtk+/gtk+-directfb_2.10.14.bb +++ b/packages/gtk+/gtk+-directfb_2.10.14.bb @@ -44,7 +44,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ # file://gtk-doc.patch;patch=1 \ " EXTRA_OECONF =" \ - --prefix=${STAGING_DIR} \ + --prefix=${STAGING_DIR_HOST}${layout_prefix} \ --with-gdktarget=directfb \ --without-x \ --without-libtiff \ diff --git |