sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity
generic-poky/meta
History
Martin Jansa 4da5ff75f7 python-2.6.6: py_package_preprocess should change Makefile only in PKGD not D 
* PACKAGEFUNCS ?= "perform_packagecopy \
                ${PACKAGE_PREPROCESS_FUNCS} \
  our py_package_preprocess is called after perform_packagecopy which does copy D to PKGD
  so we change it to target version in D (image/) before populating sysroot (sysroot-destdir/)
  while keeping Makefile.sysroot version in PKGD which was created before calling
  py_package_preprocess, so both package for runtime and sysroot end wrong

* I haven't seen this problem on faster builder, I guess because do_package and do_populate_sysroot
  can run in paralell and I was lucky that do_populate_sysroot finished before py_package_preprocess
  was started, but if you build python step by step -c package first you should see it every time

* here is proof that with PKGD it works better:
  $ bitbake -c cleanall python
  $ bitbake -c install python
  $ grep LIBDIR= \
    ./packages-split/python-distutils/usr/lib/python2.6/config/Makefile \
    ./package/usr/lib/python2.6/config/Makefile \
    ./sysroot-destdir/usr/lib/python2.6/config/Makefile \
    ./image/usr/lib/python2.6/config/Makefile \
    ./Python-2.6.6/Makefile \
    ~/shr-core/tmp/sysroots/om-gta02/usr/lib/python2.6/config/Makefile
  grep: ./packages-split/python-distutils/usr/lib/python2.6/config/Makefile: No such file or directory
  grep: ./package/usr/lib/python2.6/config/Makefile: No such file or directory
  grep: ./sysroot-destdir/usr/lib/python2.6/config/Makefile: No such file or directory
  ./image/usr/lib/python2.6/config/Makefile:LIBDIR=               /OE/shr-core/tmp/sysroots/om-gta02/usr/lib
  ./Python-2.6.6/Makefile:LIBDIR=         /usr/lib
  /OE/shr-core/tmp/sysroots/om-gta02/usr/lib/python2.6/config/Makefile:LIBDIR=            /OE/shr-core/tmp/sysroots/om-gta02/usr/lib

  $ bitbake -c package python
  $ grep LIBDIR= \
    ./packages-split/python-distutils/usr/lib/python2.6/config/Makefile \
    ./package/usr/lib/python2.6/config/Makefile \
    ./sysroot-destdir/usr/lib/python2.6/config/Makefile \
    ./image/usr/lib/python2.6/config/Makefile \
    ./Python-2.6.6/Makefile \
    ~/shr-core/tmp/sysroots/om-gta02/usr/lib/python2.6/config/Makefile
  ./packages-split/python-distutils/usr/lib/python2.6/config/Makefile:LIBDIR=             /usr/lib
  ./package/usr/lib/python2.6/config/Makefile:LIBDIR=             /usr/lib
  grep: ./sysroot-destdir/usr/lib/python2.6/config/Makefile: No such file or directory
  ./image/usr/lib/python2.6/config/Makefile:LIBDIR=               /OE/shr-core/tmp/sysroots/om-gta02/usr/lib
  ./Python-2.6.6/Makefile:LIBDIR=         /usr/lib
  /OE/shr-core/tmp/sysroots/om-gta02/usr/lib/python2.6/config/Makefile:LIBDIR=            /OE/shr-core/tmp/sysroots/om-gta02/usr/lib

  $ bitbake -c package python
  $ grep LIBDIR= \
    ./packages-split/python-distutils/usr/lib/python2.6/config/Makefile \
    ./package/usr/lib/python2.6/config/Makefile \
    ./sysroot-destdir/usr/lib/python2.6/config/Makefile \
    ./image/usr/lib/python2.6/config/Makefile \
    ./Python-2.6.6/Makefile \
    ~/shr-core/tmp/sysroots/om-gta02/usr/lib/python2.6/config/Makefile
  ./packages-split/python-distutils/usr/lib/python2.6/config/Makefile:LIBDIR=             /usr/lib
  ./package/usr/lib/python2.6/config/Makefile:LIBDIR=             /usr/lib
  ./sysroot-destdir/usr/lib/python2.6/config/Makefile:LIBDIR=             /OE/shr-core/tmp/sysroots/om-gta02/usr/lib
  ./image/usr/lib/python2.6/config/Makefile:LIBDIR=               /OE/shr-core/tmp/sysroots/om-gta02/usr/lib
  ./Python-2.6.6/Makefile:LIBDIR=         /usr/lib
  /OE/shr-core/tmp/sysroots/om-gta02/usr/lib/python2.6/config/Makefile:LIBDIR=            /OE/shr-core/tmp/sysroots/om-gta02/usr/lib

* without this patch we have /usr/lib/ in image/sysroot-destdir and SYSROOT_LIBDIR in package/packages-split
  $ grep LIBDIR= \
    ./packages-split/python-distutils/usr/lib/python2.6/config/Makefile \
    ./package/usr/lib/python2.6/config/Makefile \
    ./sysroot-destdir/usr/lib/python2.6/config/Makefile \
    ./image/usr/lib/python2.6/config/Makefile \
    ./Python-2.6.6/Makefile \
    ~/shr-core/tmp/sysroots/om-gta02/usr/lib/python2.6/config/Makefile
  ./packages-split/python-distutils/usr/lib/python2.6/config/Makefile:LIBDIR=             /OE/shr-core/tmp/sysroots/om-gta02/usr/lib
  ./package/usr/lib/python2.6/config/Makefile:LIBDIR=             /OE/shr-core/tmp/sysroots/om-gta02/usr/lib
  ./sysroot-destdir/usr/lib/python2.6/config/Makefile:LIBDIR=             /usr/lib
  ./image/usr/lib/python2.6/config/Makefile:LIBDIR=               /usr/lib
  ./Python-2.6.6/Makefile:LIBDIR=         /usr/lib
  /OE/shr-core/tmp/sysroots/om-gta02/usr/lib/python2.6/config/Makefile:LIBDIR=            /usr/lib

(From OE-Core rev: 2ba5ce85dcc3c6812b10073bfc4ab600ca169df1)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
 		2011-05-25 15:58:46 +01:00
..
classes rootfs_ipk: issue a diagnostic if rootfs is declared read-only and not all maintainer scripts could be applied offline 2011-05-25 15:50:57 +01:00
conf image_types: add IMAGE_ROOTFS_EXTRA_SPACE 2011-05-25 15:50:57 +01:00
files Fixing my bad license parsing: license.bbclass 2011-02-26 14:04:41 -08:00
lib/oe packagedata: don't choke on empty PACKAGES 2011-05-20 19:07:51 +01:00
recipes-bsp Revert "u-boot: fix LIC_FILE_CHKSUM" 2011-05-20 17:08:51 +01:00
recipes-connectivity nfs-utils_1.2.3.bb: Fix compile failure on uclibc 2011-05-20 12:40:45 +01:00
recipes-core IMAGE_ROOTFS_SIZE Cleanup 2011-05-25 15:50:57 +01:00
recipes-devtools python-2.6.6: py_package_preprocess should change Makefile only in PKGD not D 2011-05-25 15:58:46 +01:00
recipes-extended byacc: upgrade from 20101127 to 20101229 2011-05-25 15:50:55 +01:00
recipes-gnome gail: update gail to 1.20.2 2011-05-25 15:50:53 +01:00
recipes-graphics task-core-clutter: Update to 1.6 2011-05-18 14:32:44 +01:00
recipes-kernel modutils-cross: fix install issue 2011-05-20 12:43:32 +01:00
recipes-multimedia gst-plugins-base: Add tremor to DEPENDS 2011-05-25 15:50:56 +01:00
recipes-qt qt4-tools-native: Fix the patch location 2011-05-19 23:40:36 +01:00
recipes-sato puzzles: update to r9173 2011-05-23 15:36:32 +01:00
recipes-support libpcre: upgrade from 8.10 to 8.12 2011-05-25 15:50:55 +01:00
site site: Add mips-linux-uclibc site file and add to x86_64-linux-uclibc 2011-04-04 14:08:11 +01:00
COPYING.MIT Add missing licence files (COPYING.MIT) 2006-07-23 13:52:32 +00:00
recipes.txt Major layout change to the packages directory 2010-08-27 15:29:45 +01:00