libice-native: update to 1.0.4

commit 94c895aad5
Author: Richard Purdie <rpurdie@linux.intel.com>
Date:   Fri Jan 2 10:15:45 2009 +0000

bitbake.conf: Create BPN variable containing the pruned version of
PN with various suffixes removed and use this for S and FILESPATH.
This uses naming from OE but with improved code

.gitignore

@@ -1,23 +0,0 @@
-*.pyc
-*.pyo
-/*.patch
-build*/
-pyshtables.py
-pstage/
-scripts/oe-git-proxy-socks
-sources/
-meta-*/
-!meta-skeleton
-!meta-hob
-hob-image-*.bb
-*.swp
-*.orig
-*.rej
-*~
-!meta-yocto
-!meta-yocto-bsp
-!meta-yocto-imported
-documentation/user-manual/user-manual.html
-documentation/user-manual/user-manual.pdf
-documentation/user-manual/user-manual.tgz
-pull-*/

LICENSE

@@ -1,14 +1,11 @@
-Different components of OpenEmbedded are under different licenses (a mix
-of MIT and GPLv2). Please see:
+Different components of Poky are under different licenses (a mix of 
+MIT and GPLv2). Please see:
 
-meta/COPYING.GPLv2 (GPLv2)
+bitbake/COPYING (GPLv2)
 meta/COPYING.MIT (MIT)
-meta-selftest/COPYING.MIT (MIT)
-meta-skeleton/COPYING.MIT (MIT)
+meta-extras/COPYING.MIT (MIT)
 
-All metadata is MIT licensed unless otherwise stated. Source code
-included in tree for individual recipes is under the LICENSE stated in
-the associated recipe (.bb file) unless otherwise stated.
+which cover the components in those subdirectories.
 
 License information for any other files is either explicitly stated 
 or defaults to GPL version 2.

README

@@ -1,49 +1,15 @@
 Poky
 ====
 
-Poky is an integration of various components to form a complete prepackaged
-build system and development environment. It features support for building
-customised embedded device style images. There are reference demo images
-featuring a X11/Matchbox/GTK themed UI called Sato. The system supports
-cross-architecture application development using QEMU emulation and a
-standalone toolchain and SDK with IDE integration.
+Poky platform builder is a combined cross build system and development 
+environment. It features support for building X11/Matchbox/GTK based 
+filesystem images for various embedded devices and boards. It also 
+supports cross-architecture application development using QEMU emulation
+and a standalone toolchain and SDK with IDE integration.
+
+Poky has an extensive handbook, the source of which is contained in
+the handbook directory. For compiled HTML or pdf versions of this, 
+see the Poky website http://pokylinux.org.
 
 Additional information on the specifics of hardware that Poky supports
-is available in README.hardware. Further hardware support can easily be added
-in the form of layers which extend the systems capabilities in a modular way.
-
-As an integration layer Poky consists of several upstream projects such as 
-BitBake, OpenEmbedded-Core, Yocto documentation and various sources of information 
-e.g. for the hardware support. Poky is in turn a component of the Yocto Project.
-
-The Yocto Project has extensive documentation about the system including a 
-reference manual which can be found at:
-    http://yoctoproject.org/documentation
-
-OpenEmbedded-Core is a layer containing the core metadata for current versions
-of OpenEmbedded. It is distro-less (can build a functional image with
-DISTRO = "nodistro") and contains only emulated machine support.
-
-For information about OpenEmbedded, see the OpenEmbedded website:
-    http://www.openembedded.org/
-
-Where to Send Patches
-=====================
-
-As Poky is an integration repository, patches against the various components
-should be sent to their respective upstreams.
-
-bitbake:
-    bitbake-devel@lists.openembedded.org
-
-meta-yocto:
-    poky@yoctoproject.org
-
-Most everything else should be sent to the OpenEmbedded Core mailing list.  If
-in doubt, check the oe-core git repository for the content you intend to modify.
-Before sending, be sure the patches apply cleanly to the current oe-core git
-repository.
-    openembedded-core@lists.openembedded.org
-
-Note: The scripts directory should be treated with extra care as it is a mix
-      of oe-core and poky-specific files.
+is available in README.hardware.

README.hardware

@@ -1,494 +1,436 @@
-                          Poky Hardware README
-                          ====================
+                     Poky Hardware Reference Guide
+                     =============================
 
-This file gives details about using Poky with the reference machines
-supported out of the box. A full list of supported reference target machines
-can be found by looking in the following directories:
+This file gives details about using Poky with different hardware reference
+boards and consumer devices. A full list of target machines can be found by 
+looking in the meta/conf/machine/ directory. If in doubt about using Poky with 
+your hardware, consult the documentation for your board/device. To discuss 
+support for further hardware reference boards/devices please contact OpenedHand.
 
-   meta/conf/machine/
-   meta-yocto-bsp/conf/machine/
-
-If you are in doubt about using Poky/OpenEmbedded with your hardware, consult
-the documentation for your board/device.
-
-Support for additional devices is normally added by creating BSP layers - for
-more information please see the Yocto Board Support Package (BSP) Developer's
-Guide - documentation source is in documentation/bspguide or download the PDF
-from:
-
-   http://yoctoproject.org/documentation
-
-Support for physical reference hardware has now been split out into a
-meta-yocto-bsp layer which can be removed separately from other layers if not
-needed.
-
-
-QEMU Emulation Targets
-======================
-
-To simplify development, the build system supports building images to
-work with the QEMU emulator in system emulation mode. Several architectures
-are currently supported:
-
-  * ARM (qemuarm)
-  * x86 (qemux86)
-  * x86-64 (qemux86-64)
-  * PowerPC (qemuppc)
-  * MIPS (qemumips)
-
-Use of the QEMU images is covered in the Yocto Project Reference Manual.
-The appropriate MACHINE variable value corresponding to the target is given
-in brackets.
+QEMU Emulation Images (qemuarm and qemux86)
+===========================================
 
+To simplify development Poky supports building images to work with the QEMU
+emulator in system emulation mode. Two architectures are currently supported,
+ARM (via qemuarm) and x86 (via qemux86). Use of the QEMU images is covered
+in the Poky Handbook.
 
 Hardware Reference Boards
 =========================
 
-The following boards are supported by the meta-yocto-bsp layer:
+The following boards are supported by Poky:
 
-  * Texas Instruments Beagleboard (beagleboard)
-  * Freescale MPC8315E-RDB (mpc8315e-rdb)
-  * Ubiquiti Networks RouterStation Pro (routerstationpro)
-
-For more information see the board's section below. The appropriate MACHINE
-variable value corresponding to the board is given in brackets.
+  * Compulab CM-X270 (cm-x270)
+  * Compulab EM-X270 (em-x270)
+  * FreeScale iMX31ADS (mx31ads)
+  * Marvell PXA3xx Zylonite (zylonite)
+  * Logic iMX31 Lite Kit (mx31litekit)
+  * Phytec phyCORE-iMX31 (mx31phy)
 
+For more information see board's section below. The Poky MACHINE setting
+corresponding to the board is given in brackets.
 
 Consumer Devices
 ================
 
-The following consumer devices are supported by the meta-yocto-bsp layer:
+The following consumer devices are supported by Poky:
 
-  * Intel x86 based PCs and devices (genericx86)
+  * FIC Neo1973 GTA01 smartphone (fic-gta01)
+  * HTC Universal (htcuniversal)
+  * Nokia 770/N800/N810 Internet Tablets (nokia770 and nokia800)
+  * Sharp Zaurus SL-C7x0 series (c7x0)
+  * Sharp Zaurus SL-C1000 (akita)
+  * Sharp Zaurus SL-C3x00 series (spitz)
 
-For more information see the device's section below. The appropriate MACHINE
-variable value corresponding to the device is given in brackets.
+For more information see board's section below. The Poky MACHINE setting
+corresponding to the board is given in brackets.
 
+Poky Boot CD (bootcdx86)
+========================
 
+The Poky boot CD iso images are designed as a demonstration of the Poky 
+environment and to show the versatile image formats Poky can generate. It will
+run on Pentium2 or greater PC style computers. The iso image can be 
+burnt to CD and then booted from.
 
-                      Specific Hardware Documentation
-                      ===============================
 
+                          Hardware Reference Boards
+                          =========================
 
-Intel x86 based PCs and devices (genericx86)
-==========================================
+Compulab CM-X270 (cm-x270)
+==========================
 
-The genericx86 MACHINE is tested on the following platforms:
+The bootloader on this board doesn't support writing jffs2 images directly to 
+NAND and normally uses a proprietary kernel flash driver. To allow the use of
+jffs2 images, a two stage updating procedure is needed. Firstly, an initramfs
+is booted which contains mtd utilities and this is then used to write the main
+filesystem. 
 
-Intel Xeon/Core i-Series:
-  + Intel Romley Server: Sandy Bridge Xeon processor, C600 PCH (Patsburg), (Canoe Pass CRB)
-  + Intel Romley Server: Ivy Bridge Xeon processor, C600 PCH (Patsburg), (Intel SDP S2R3)
-  + Intel Crystal Forest Server: Sandy Bridge Xeon processor, DH89xx PCH (Cave Creek), (Stargo CRB)
-  + Intel Chief River Mobile: Ivy Bridge Mobile processor, QM77 PCH (Panther Point-M), (Emerald Lake II CRB, Sabino Canyon CRB)
-  + Intel Huron River Mobile: Sandy Bridge processor, QM67 PCH (Cougar Point), (Emerald Lake CRB, EVOC EC7-1817LNAR board)
-  + Intel Calpella Platform: Core i7 processor, QM57 PCH (Ibex Peak-M), (Red Fort CRB, Emerson MATXM CORE-411-B)
-  + Intel Nehalem/Westmere-EP Server: Xeon 56xx/55xx processors, 5520 chipset, ICH10R IOH (82801), (Hanlan Creek CRB)
-  + Intel Nehalem Workstation: Xeon 56xx/55xx processors, System SC5650SCWS (Greencity CRB)
-  + Intel Picket Post Server: Xeon 56xx/55xx processors (Jasper Forest), 3420 chipset (Ibex Peak), (Osage CRB)
-  + Intel Storage Platform: Sandy Bridge Xeon processor, C600 PCH (Patsburg), (Oak Creek Canyon CRB)
-  + Intel Shark Bay Client Platform: Haswell processor, LynxPoint PCH, (Walnut Canyon CRB, Lava Canyon CRB, Basking Ridge CRB, Flathead Creek CRB)
-  + Intel Shark Bay Ultrabook Platform: Haswell ULT processor, Lynx Point-LP PCH, (WhiteTip Mountain 1 CRB)
+It is assumed the board is connected to a network where a TFTP server is 
+available and that a serial terminal is available to communicate with the 
+bootloader (38400, 8N1). If a DHCP server is available the device will use it
+to obtain an IP address. If not, run:
 
-Intel Atom platforms:
-  + Intel embedded Menlow: Intel Atom Z510/530 CPU, System Controller Hub US15W (Portwell NANO-8044)
-  + Intel Luna Pier: Intel Atom N4xx/D5xx series CPU (aka: Pineview-D & -M), 82801HM I/O Hub (ICH8M), (Advantech AIMB-212, Moon Creek CRB)
-  + Intel Queens Bay platform: Intel Atom E6xx CPU (aka: Tunnel Creek), Topcliff EG20T I/O Hub (Emerson NITX-315, Crown Bay CRB, Minnow Board)
-  + Intel Fish River Island platform: Intel Atom E6xx CPU (aka: Tunnel Creek), Topcliff EG20T I/O Hub (Kontron KM2M806)
-  + Intel Cedar Trail platform: Intel Atom N2000 & D2000 series CPU (aka: Cedarview), NM10 Express Chipset (Norco kit BIS-6630, Cedar Rock CRB)
+  ARMmon > setip dhcp off
+  ARMmon > setip ip 192.168.1.203
+  ARMmon > setip mask 255.255.255.0
 
-and is likely to work on many unlisted Atom/Core/Xeon based devices. The MACHINE
-type supports ethernet, wifi, sound, and Intel/vesa graphics by default in
-addition to common PC input devices, busses, and so on.  Note that it does not
-included the binary-only graphic drivers used on some Atom platforms, for
-accelerated graphics on these machines please refer to meta-intel.
+To reflash the kernel:
 
-Depending on the device, it can boot from a traditional hard-disk, a USB device,
-or over the network. Writing generated images to physical media is
-straightforward with a caveat for USB devices. The following examples assume the
-target boot device is /dev/sdb, be sure to verify this and use the correct
-device as the following commands are run as root and are not reversable.
+  ARMmon > download kernel tftp zimage 192.168.1.202
+  ARMmon > flash kernel
 
-USB Device:
-  1. Build a live image. This image type consists of a simple filesystem
-     without a partition table, which is suitable for USB keys, and with the
-     default setup for the genericx86 machine, this image type is built
-     automatically for any image you build. For example:
+where zimage is the name of the kernel on the TFTP server and its IP address is 
+192.168.1.202. The names of the files must be all lowercase.
 
-     $ bitbake core-image-minimal
+To reflash the initrd/initramfs:
 
-  2. Use the "dd" utility to write the image to the raw block device. For
-     example:
+  ARMmon > download ramdisk tftp diskimage 192.168.1.202
+  ARMmon > flash ramdisk
 
-     # dd if=core-image-minimal-genericx86.hddimg of=/dev/sdb
+where diskimage is the name of the initramfs image (a cpio.gz file).
 
-  If the device fails to boot with "Boot error" displayed, or apparently
-  stops just after the SYSLINUX version banner, it is likely the BIOS cannot
-  understand the physical layout of the disk (or rather it expects a
-  particular layout and cannot handle anything else). There are two possible
-  solutions to this problem:
+To boot the initramfs:
 
-  1. Change the BIOS USB Device setting to HDD mode. The label will vary by
-     device, but the idea is to force BIOS to read the Cylinder/Head/Sector
-     geometry from the device.
+  ARMmon > ramdisk on
+  ARMmon > bootos "console=ttyS0,38400 rdinit=/sbin/init"
 
-  2. Without such an option, the BIOS generally boots the device in USB-ZIP
-     mode. To write an image to a USB device that will be bootable in
-     USB-ZIP mode, carry out the following actions:
+To reflash the main image login to the system as user "root", then run:
 
-     a. Determine the geometry of your USB device using fdisk:
+  # ifconfig eth0 192.168.1.203
+  # tftp -g -r mainimage 192.168.1.202
+  # flash_eraseall /dev/mtd1
+  # nandwrite /dev/mtd1 mainimage
 
-     # fdisk /dev/sdb
-     Command (m for help): p
+which configures the network interface with the IP address 192.168.1.203,
+downloads the "mainimage" file from the TFTP server at 192.168.1.202, erases
+the flash and then writes the new image to the flash.
 
-     Disk /dev/sdb: 4011 MB, 4011491328 bytes
-     124 heads, 62 sectors/track, 1019 cylinders, total 7834944 sectors
-     ...
+The main image can then be booted with:
 
-     Command (m for help): q
+  ARMmon > bootos "console=ttyS0,38400 root=/dev/mtdblock1 rootfstype=jffs2"
 
-     b. Configure the USB device for USB-ZIP mode:
-     
-     # mkdiskimage -4 /dev/sdb 1019 124 62
+Note that the initramfs image is built by poky in a slightly different mode to
+normal since it uses uclibc. To generate this use a command like:
 
-     Where 1019, 124 and 62 are the cylinder, head and sectors/track counts
-     as reported by fdisk (substitute the values reported for your device).
-     When the operation has finished and the access LED (if any) on the
-     device stops flashing, remove and reinsert the device to allow the
-     kernel to detect the new partition layout.
+IMAGE_FSTYPES=cpio.gz MACHINE=cm-x270 POKYLIBC=uclibc bitbake poky-image-minimal-mtdutils
 
-     c. Copy the contents of the image to the USB-ZIP mode device:
 
-     # mkdir /tmp/image
-     # mkdir /tmp/usbkey
-     # mount -o loop core-image-minimal-genericx86.hddimg  /tmp/image
-     # mount /dev/sdb4 /tmp/usbkey
-     # cp -rf /tmp/image/* /tmp/usbkey
+Compulab EM-X270 (em-x270)
+==========================
 
-     d. Install the syslinux boot loader:
-
-     # syslinux /dev/sdb4
-
-     e. Unmount everything:
+Fetch the "Linux - kernel and run-time image (Angstrom)" ZIP file from the
+Compulab website. Inside the images directory of this ZIP file is another ZIP
+file called 'LiveDisk.zip'. Extract this over a cleanly formatted vfat USB flash
+drive. Replace the 'em_x270.img' file with the 'updater-em-x270.ext2' file.
 
-     # umount /tmp/image
-     # umount /tmp/usbkey
+Insert this USB disk into the supplied adapter and connect this to the
+board. Whilst holding down the the suspend button press the reset button. The
+board will now boot off the USB key and into a version of Angstrom. On the
+desktop is an icon labelled "Updater". Run this program to launch the updater
+that will flash the Poky kernel and rootfs to the board.
 
-  Install the boot device in the target board and configure the BIOS to boot
-  from it.
-
-  For more details on the USB-ZIP scenario, see the syslinux documentation:
-  http://git.kernel.org/?p=boot/syslinux/syslinux.git;a=blob_plain;f=doc/usbkey.txt;hb=HEAD
-
-
-Texas Instruments Beagleboard (beagleboard)
-===========================================
 
-The Beagleboard is an ARM Cortex-A8 development board with USB, DVI-D, S-Video,
-2D/3D accelerated graphics, audio, serial, JTAG, and SD/MMC. The xM adds a
-faster CPU, more RAM, an ethernet port, more USB ports, microSD, and removes
-the NAND flash. The beagleboard MACHINE is tested on the following platforms:
+FreeScale iMX31ADS (mx31ads)
+===========================
 
-  o Beagleboard C4
-  o Beagleboard xM rev A & B
+The correct serial port is the top-most female connector to the right of the
+ethernet socket.
 
-The Beagleboard C4 has NAND, while the xM does not. For the sake of simplicity,
-these instructions assume you have erased the NAND on the C4 so its boot
-behavior matches that of the xM. To do this, issue the following commands from
-the u-boot prompt (note that the unlock may be unecessary depending on the
-version of u-boot installed on your board and only one of the erase commands
-will succeed):
+For uploading data to RedBoot we are going to use tftp. In this example we
+assume that the tftpserver is on 192.168.9.1 and the board is on192.168.9.2. 
 
-    # nand unlock
-    # nand erase
-    # nand erase.chip
+To set the IP address, run:
 
-To further tailor these instructions for your board, please refer to the
-documentation at http://www.beagleboard.org.
+  ip_address -l 192.168.9.2/24 -h 192.168.9.1
 
-From a Linux system with access to the image files perform the following steps
-as root, replacing mmcblk0* with the SD card device on your machine (such as sdc
-if used via a usb card reader):
+To download a kernel called "zimage" from the TFTP server, run:
 
-  1. Partition and format an SD card:
-     # fdisk -lu /dev/mmcblk0
-     
-     Disk /dev/mmcblk0: 3951 MB, 3951034368 bytes
-     255 heads, 63 sectors/track, 480 cylinders, total 7716864 sectors
-     Units = sectors of 1 * 512 = 512 bytes
-     
-             Device Boot      Start         End      Blocks  Id System
-     /dev/mmcblk0p1   *          63      144584       72261   c Win95 FAT32 (LBA)
-     /dev/mmcblk0p2          144585      465884      160650  83 Linux
+  load -r -b 0x100000 zimage
 
-     # mkfs.vfat -F 16 -n "boot" /dev/mmcblk0p1
-     # mke2fs -j -L "root" /dev/mmcblk0p2
+To write the kernel to flash run:
 
-  The following assumes the SD card partition 1 and 2 are mounted at
-  /media/boot and /media/root respectively. Removing the card and reinserting
-  it will do just that on most modern Linux desktop environments.
-  
-  The files referenced below are made available after the build in
-  build/tmp/deploy/images.
+  fis create kernel
 
-  2. Install the boot loaders
-     # cp MLO-beagleboard /media/boot/MLO
-     # cp u-boot-beagleboard.bin /media/boot/u-boot.bin
+To download a rootfs jffs2 image "rootfs" from the TFTP server, run:
 
-  3. Install the root filesystem
-     # tar x -C /media/root -f core-image-$IMAGE_TYPE-beagleboard.tar.bz2
-     # tar x -C /media/root -f modules-$KERNEL_VERSION-beagleboard.tgz
+  load -r -b 0x100000 rootfs
 
-  4. Install the kernel uImage
-     # cp uImage-beagleboard.bin /media/boot/uImage
+To write the root filesystem  to flash run:
 
-  5. Prepare a u-boot script to simplify the boot process
-     The Beagleboard can be made to boot at this point from the u-boot command
-     shell. To automate this process, generate a user.scr script as follows.
+  fis create root
 
-     Install uboot-mkimage (from uboot-mkimage on Ubuntu or uboot-tools on Fedora).
+To load and boot a kernel and rootfs from flash:
 
-     Prepare a script config:
+  fis load kernel
+  exec -b 0x100000 -l 0x200000 -c "noinitrd console=ttymxc0,115200 root=/dev/mtdblock2 rootfstype=jffs2 init=linuxrc ip=none"
 
-     # (cat << EOF
-     setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; bootm 0x80300000'
-     setenv bootargs 'console=tty0 console=ttyO2,115200n8 root=/dev/mmcblk0p2 rootwait rootfstype=ext3 ro'
-     boot
-     EOF
-     ) > serial-boot.cmd
-     # mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Core Minimal" -d ./serial-boot.cmd ./boot.scr
-     # cp boot.scr /media/boot
+To load and boot a kernel from a TFTP server with the rootfs over NFS:
 
-   6. Unmount the SD partitions, insert the SD card into the Beagleboard, and
-      boot the Beagleboard
+  load -r -b 0x100000 zimage
+  exec -b 0x100000 -l 0x200000 -c "noinitrd console=ttymxc0,115200 root=/dev/nfs nfsroot=192.168.9.1:/mnt/nfsmx31 rw ip=192.168.9.2::192.168.9.1:255.255.255.0"
 
-Note: As of the 2.6.37 linux-yocto kernel recipe, the Beagleboard uses the
-      OMAP_SERIAL device (ttyO2). If you are using an older kernel, such as the
-      2.6.34 linux-yocto-stable, be sure to replace ttyO2 with ttyS2 above. You
-      should also override the machine SERIAL_CONSOLE in your local.conf in
-      order to setup the getty on the serial line:
+The instructions above are for using the (default) NOR flash on the board,
+there is also 128M of NAND flash. It is possible to install Poky to the NAND 
+flash which gives more space for the rootfs and instructions for using this are
+given below. To switch to the NAND flash:
 
-      SERIAL_CONSOLE_beagleboard = "115200 ttyS2"
+  factive NAND
 
+This will then restart RedBoot using the NAND rather than the NOR. If you
+have not used the NAND before then it is unlikely that there will be a
+partition table yet. You can get the list of partitions with 'fis list'.
 
-Freescale MPC8315E-RDB (mpc8315e-rdb)
-=====================================
+If this shows no partitions then you can create them with:
 
-The MPC8315 PowerPC reference platform (MPC8315E-RDB) is aimed at hardware and
-software development of network attached storage (NAS) and digital media server
-applications. The MPC8315E-RDB features the PowerQUICC II Pro processor, which
-includes a built-in security accelerator.
+  fis init
 
-(Note: you may find it easier to order MPC8315E-RDBA; this appears to be the
-same board in an enclosure with accessories. In any case it is fully
-compatible with the instructions given here.)
+The output of 'fis list' should now show:
 
-Setup instructions
-------------------
+Name              FLASH addr  Mem addr    Length      Entry point
+RedBoot           0xE0000000  0xE0000000  0x00040000  0x00000000
+FIS directory     0xE7FF4000  0xE7FF4000  0x00003000  0x00000000
+RedBoot config    0xE7FF7000  0xE7FF7000  0x00001000  0x00000000
 
-You will need the following:
-* NFS root setup on your workstation
-* TFTP server installed on your workstation
-* Straight-thru 9-conductor serial cable (DB9, M/F) connected from your 
-  PC to UART1
-* Ethernet connected to the first ethernet port on the board
+Partitions for the kernel and rootfs need to be created:
 
---- Preparation ---
+fis create -l 0x1A0000 -e 0x00100000 kernel
+fis create -l 0x5000000 -e 0x00100000 root
 
-Note: if you have altered your board's ethernet MAC address(es) from the
-defaults, or you need to do so because you want multiple boards on the same
-network, then you will need to change the values in the dts file (patch
-linux/arch/powerpc/boot/dts/mpc8315erdb.dts within the kernel source). If
-you have left them at the factory default then you shouldn't need to do
-anything here.
+You may now use the instructions above for flashing. However it is important
+to note that the erase block size for the NAND is different to the NOR so the
+JFFS erase size will need to be changed to 0x4000. Stardard images are built
+for NOR and you will need to build custom images for NAND.
 
---- Booting from NFS root ---
+You will also need to update the kernel command line to use the correct root
+filesystem. This should be '/dev/mtdblock7' if you adhere to the partitioning
+scheme shown above. If this fails then you can doublecheck against the output
+from the kernel when it evaluates the available mtd partitions.
 
-Load the kernel and dtb (device tree blob), and boot the system as follows:
 
- 1. Get the kernel (uImage-mpc8315e-rdb.bin) and dtb (uImage-mpc8315e-rdb.dtb)
-    files from the tmp/deploy directory, and make them available on your TFTP
-    server.
+Marvell PXA3xx Zylonite (zylonite)
+==================================
 
- 2. Connect the board's first serial port to your workstation and then start up
-    your favourite serial terminal so that you will be able to interact with
-    the serial console. If you don't have a favourite, picocom is suggested:
+These instructions assume the Zylonite is connected to a machine running a TFTP 
+server at address 192.168.123.5 and that a serial link (38400 8N1) is available 
+to access the blob bootloader. The kernel is on the TFTP server as 
+"zylonite-kernel" and the root filesystem jffs2 file is "zylonite-rootfs" and 
+the images are to be saved in NAND flash.
 
-  $ picocom /dev/ttyUSB0 -b 115200
+The following commands setup blob:
 
- 3. Power up or reset the board and press a key on the terminal when prompted
-    to get to the U-Boot command line
+  blob> setip client 192.168.123.4
+  blob> setip server 192.168.123.5
 
- 4. Set up the environment in U-Boot:
+To flash the kernel:
 
- => setenv ipaddr <board ip>
- => setenv serverip <tftp server ip>
- => setenv bootargs root=/dev/nfs rw nfsroot=<nfsroot ip>:<rootfs path> ip=<board ip>:<server ip>:<gateway ip>:255.255.255.0:mpc8315e:eth0:off console=ttyS0,115200
+  blob> tftp zylonite-kernel
+  blob> nandwrite -j 0x80800000 0x60000 0x200000
 
- 5. Download the kernel and dtb, and boot:
+To flash the rootfs:
 
- => tftp 1000000 uImage-mpc8315e-rdb.bin
- => tftp 2000000 uImage-mpc8315e-rdb.dtb
- => bootm 1000000 - 2000000
+  blob> tftp zylonite-rootfs
+  blob> nanderase -j 0x260000 0x5000000
+  blob> nandwrite -j 0x80800000 0x260000 <length>
 
+(where <length> is the rootfs size which will be printed by the tftp step)
 
-Ubiquiti Networks RouterStation Pro (routerstationpro)
-======================================================
+To boot the board:
 
-The RouterStation Pro is an Atheros AR7161 MIPS-based board. Geared towards
-networking applications, it has all of the usual features as well as three
-type IIIA mini-PCI slots and an on-board 3-port 10/100/1000 Ethernet switch,
-in addition to the 10/100/1000 Ethernet WAN port which supports
-Power-over-Ethernet.
+  blob> nkernel
+  blob> boot
 
-Setup instructions
-------------------
 
-You will need the following:
-* A serial cable - female to female (or female to male + gender changer)
-  NOTE: cable must be straight through, *not* a null modem cable.
-* USB flash drive or hard disk that is able to be powered from the
-  board's USB port.
-* tftp server installed on your workstation
+Logic iMX31 Lite Kit (mx31litekit)
+===============================
 
-NOTE: in the following instructions it is assumed that /dev/sdb corresponds
-to the USB disk when it is plugged into your workstation. If this is not the
-case in your setup then please be careful to substitute the correct device
-name in all commands where appropriate.
+The easiest method to boot this board is to take an MMC/SD card and format 
+the first partition as ext2, then extract the poky image onto this as root. 
+Assuming the board is network connected, a TFTP server is available at 
+192.168.1.33 and a serial terminal is available (115200 8N1), the following 
+commands will boot a kernel called "mx31kern" from the TFTP server:
 
---- Preparation ---
+  losh> ifconfig sm0 192.168.1.203 255.255.255.0 192.168.1.33
+  losh> load raw 0x80100000 0x200000 /tftp/192.168.1.33:mx31kern
+  losh> exec 0x80100000 - 
 
-1) Build an image (e.g. core-image-minimal) using "routerstationpro" as the
-MACHINE
 
-2) Partition the USB drive so that primary partition 1 is type Linux (83).
-Minimum size depends on your root image size - core-image-minimal probably
-only needs 8-16MB, other images will need more.
+Phytec phyCORE-iMX31 (mx31phy)
+==============================
 
-  # fdisk /dev/sdb
-  Command (m for help): p
+Support for this board is currently being developed. Experimental jffs2 
+images and a suitable kernel are available and are known to work with the
+board.
 
-  Disk /dev/sdb: 4011 MB, 4011491328 bytes
-  124 heads, 62 sectors/track, 1019 cylinders, total 7834944 sectors
-  Units = sectors of 1 * 512 = 512 bytes
-  Sector size (logical/physical): 512 bytes / 512 bytes
-  I/O size (minimum/optimal): 512 bytes / 512 bytes
-  Disk identifier: 0x0009e87d
 
-     Device Boot      Start         End      Blocks   Id  System
-  /dev/sdb1              62     1952751      976345   83  Linux
+                             Consumer Devices
+                             ================
 
-3) Format partition 1 on the USB as ext3
+FIC Neo1973 GTA01 smartphone (fic-gta01)
+========================================
 
-  # mke2fs -j /dev/sdb1
+To install Poky on a GTA01 smartphone you will need "dfu-util" tool
+which you can build with "bitbake dfu-util-native" command.
 
-4) Mount partition 1 and then extract the contents of
-tmp/deploy/images/core-image-XXXX.tar.bz2 into it (preserving permissions).
+Flashing requires these steps:
 
-  # mount /dev/sdb1 /media/sdb1
-  # cd /media/sdb1
-  # tar -xvjpf tmp/deploy/images/core-image-XXXX.tar.bz2
+  1. Power down the device.
+  2. Connect the device to the host machine via USB.
+  3. Hold AUX key and press Power key. There should be a bootmenu
+     on screen.
+  4. Run "dfu-util -l" to check if the phone is visible on the USB bus. 
+     The output should look like this:
 
-5) Unmount the USB drive and then plug it into the board's USB port
+     dfu-util - (C) 2007 by OpenMoko Inc.
+     This program is Free Software and has ABSOLUTELY NO WARRANTY
 
-6) Connect the board's serial port to your workstation and then start up
-your favourite serial terminal so that you will be able to interact with
-the serial console. If you don't have a favourite, picocom is suggested:
+     Found Runtime: [0x1457:0x5119] devnum=19, cfg=0, intf=2, alt=0, name="USB Device Firmware Upgrade"
 
-  $ picocom /dev/ttyUSB0 -b 115200
+  5. Flash the kernel with "dfu-util -a kernel -D uImage-2.6.21.6-moko11-r2-fic-gta01.bin"
+  6. Flash rootfs with "dfu-util -a rootfs -D <image>", where <image> is the
+     jffs2 image file to use as the root filesystem 
+     (e.g. ./tmp/deploy/images/poky-image-sato-fic-gta01.jffs2) 
 
-7) Connect the network into eth0 (the one that is NOT the 3 port switch). If
-you are using power-over-ethernet then the board will power up at this point.
 
-8) Start up the board, watch the serial console. Hit Ctrl+C to abort the
-autostart if the board is configured that way (it is by default). The
-bootloader's fconfig command can be used to disable autostart and configure
-the IP settings if you need to change them (default IP is 192.168.1.20).
+HTC Universal (htcuniversal)
+============================
 
-9) Make the kernel (tmp/deploy/images/vmlinux-routerstationpro.bin) available
-on the tftp server.
+Note: HTC Universal support is highly experimental.
 
-10) If you are going to write the kernel to flash (optional - see "Booting a
-kernel directly" below for the alternative), remove the current kernel and
-rootfs flash partitions. You can list the partitions using the following
-bootloader command:
+On the HTC Universal, entirely replacing the Windows installation is not 
+supported, instead Poky is booted from an MMC/SD card from Windows. Once Poky
+has booted, Windows is no longer in memory or active but when power is removed,
+the user will be returned to windows and will need to return to Linux from 
+there.
 
-  RedBoot> fis list
+Once an MMC/SD card is available it is suggested its split into two partitions,
+one for a program called HaRET which lets you boot Linux from within Windows
+and the second for the rootfs. The HaRET partition should be the first partition
+on the card and be vfat formatted. It doesn't need to be large, just enough for
+HaRET and a kernel (say 5MB max). The rootfs should be ext2 and is usually the 
+second partition. The first partition should be vfat so Windows recognises it 
+as if it doesn't, it has been known to reformat cards.
 
-You can delete the existing kernel and rootfs with these commands:
+On the first partition you need three files:
 
-  RedBoot> fis delete kernel
-  RedBoot> fis delete rootfs
+  * a HaRET binary (version 0.5.1 works well and a working version 
+    should be part of the last Poky release)
+  * a kernel renamed to "zImage"
+  * a default.txt which contains:
 
---- Booting a kernel directly ---
+set kernel "zImage"
+set mtype "855"
+set cmdline "root=/dev/mmcblk0p2 rw console=ttyS0,115200n8 console=tty0 rootdelay=5 fbcon=rotate:1"
+boot2
 
-1) Load the kernel using the following bootloader command:
+On the second parition the root file system is extracted as root. A different
+partition layout or other kernel options can be changed in the default.txt file.
 
-  RedBoot> load -m tftp -h <ip of tftp server> vmlinux-routerstationpro.bin
+When inserted into the device, Windows should see the card and let you browse
+its contents using File Explorer. Running the HaRET binary will present a dialog
+box (maybe after messages warning about running unsigned binaries) where you 
+select OK and you should then see Poky boot. Kernel messages can be seen by 
+adding psplash=false to the kernel commandline.
 
-You should see a message on it being successfully loaded.
 
-2) Execute the kernel:
+Nokia 770/N800/N810 Internet Tablets (nokia770 and nokia800)
+============================================================
 
-  RedBoot> exec -c "console=ttyS0,115200 root=/dev/sda1 rw rootdelay=2 board=UBNT-RSPRO"
+Note: Nokia tablet support is highly experimental.
 
-Note that specifying the command line with -c is important as linux-yocto does
-not provide a default command line.
+The Nokia internet tablet devices are OMAP based tablet formfactor devices 
+with large screens (800x480), wifi and touchscreen.
 
---- Writing a kernel to flash ---
+To flash images to these devices you need the "flasher" utility which can be 
+downloaded from the http://tablets-dev.nokia.com/d3.php?f=flasher-3.0. This 
+utility needs to be run as root and the usb filesystem needs to be mounted 
+although most distributions will have done this for you. Once you have this 
+follow these steps:
 
-1) Go to your tftp server and gzip the kernel you want in flash. It should
-halve the size.
+  1. Power down the device.
+  2. Connect the device to the host machine via USB 
+     (connecting power to the device doesn't hurt either).
+  3. Run "flasher -i"
+  4. Power on the device.
+  5. The program should give an indication it's found 
+     a tablet device. If not, recheck the cables, make sure you're 
+     root and usbfs/usbdevfs is mounted.
+  6. Run "flasher -r <image> -k <kernel> -f", where <image> is the
+     jffs2 image file to use as the root filesystem 
+     (e.g. ./tmp/deploy/images/poky-image-sato-nokia800.jffs2) 
+     and <kernel> is the kernel to use 
+     (e.g. ./tmp/deploy/images/zImage-nokia800.bin).
+  7. Run "flasher -R" to reboot the device.
+  8. The device should boot into Poky.
 
-2) Load the kernel using the following bootloader command:
+The nokia800 images and kernel will run on both the N800 and N810.
 
-  RedBoot> load -r -b 0x80600000 -m tftp -h <ip of tftp server> vmlinux-routerstationpro.bin.gz
 
-This should output something similar to the following:
+Sharp Zaurus SL-C7x0 series (c7x0)
+==================================
 
-  Raw file loaded 0x80600000-0x8087c537, assumed entry at 0x80600000
+The Sharp Zaurus c7x0 series (SL-C700, SL-C750, SL-C760, SL-C860, SL-7500)
+are PXA25x based handheld PDAs with VGA screens. To install Poky images on
+these devices follow these steps:
 
-Calculate the length by subtracting the first number from the second number
-and then rounding the result up to the nearest 0x1000.
+  1. Obtain an SD/MMC or CF card with a vfat or ext2 filesystem.
+  2. Copy a jffs2 image file (e.g. poky-image-sato-c7x0.jffs2) onto the
+     card as "initrd.bin":
 
-3) Using the length calculated above, create a flash partition for the kernel:
+     $ cp ./tmp/deploy/images/poky-image-sato-c7x0.jffs2 /path/to/my-cf-card/initrd.bin
 
-  RedBoot> fis create -b 0x80600000 -l 0x240000 kernel
+  3. Copy an Linux kernel file (zImage-c7x0.bin) onto the card as 
+     "zImage.bin":
 
-(change 0x240000 to your rounded length -- change "kernel" to whatever
-you want to name your kernel)
+     $ cp ./tmp/deploy/images/zImage-c7x0.bin /path/to/my-cf-card/zImage.bin
 
---- Booting a kernel from flash ---
+  4. Copy an updater script (updater.sh.c7x0) onto the card
+     as "updater.sh":
 
-To boot the flashed kernel perform the following steps.
+     $ cp ./tmp/deploy/images/updater.sh.c7x0 /path/to/my-cf-card/updater.sh
 
-1) At the bootloader prompt, load the kernel:
+  5. Power down the Zaurus.
+  6. Hold "OK" key and power on the device. An update menu should appear 
+     (in Japanese).
+  7. Choose "Update" (item 4).
+  8. The next screen will ask for the source, choose the appropriate 
+     card (CF or SD).
+  9. Make sure AC power is connected.
+  10. The next screen asks for confirmation, choose "Yes" (the left button).
+  11. The update process will start, flash the files on the card onto 
+      the device and the device will then reboot into Poky.
 
-  RedBoot> fis load -d -e kernel
 
-(Change the name "kernel" above if you chose something different earlier)
+Sharp Zaurus SL-C1000 (akita)
+=============================
 
-(-e means 'elf', -d 'decompress')
+The Sharp Zaurus SL-C1000 is a PXA270 based device otherwise similar to the 
+c7x0. To install Poky images on this device follow the instructions for 
+the c7x0 but replace "c7x0" with "akita" where appropriate.
 
-2) Execute the kernel using the exec command as above.
 
---- Automating the boot process ---
+Sharp Zaurus SL-C3x00 series (spitz)
+====================================
+
+The Sharp Zaurus SL-C3x00 devices are PXA270 based devices similar
+to akita but with an internal microdrive. The installation procedure 
+assumes a standard microdrive based device where the root (first) 
+partition has been enlarged to fit the image (at least 100MB, 
+400MB for the SDK).
+
+The procedure is the same as for the c7x0 and akita models with the 
+following differences:
+
+ 1. Instead of a jffs2 image you need to copy a compressed tarball of the 
+    root fileystem (e.g. poky-image-sato-spitz.tar.gz) onto the
+    card as "hdimage1.tgz":
+
+    $ cp ./tmp/deploy/images/poky-image-sato-spitz.tar.gz /path/to/my-cf-card/hdimage1.tgz
+
+ 2. You additionally need to copy a special tar utility  (gnu-tar) onto 
+    the card as "gnu-tar":
+
+    $ cp ./tmp/deploy/images/gnu-tar /path/to/my-cf-card/gnu-tar
 
-After writing the kernel to flash and testing the load and exec commands
-manually, you can automate the boot process with a boot script.
 
-1) RedBoot> fconfig
-   (Answer the questions not specified here as they pertain to your environment)
-2) Run script at boot: true
-  Boot script: 
-  .. fis load -d -e kernel
-  .. exec
-  Enter script, terminate with empty line
-  >> fis load -d -e kernel
-  >> exec -c "console=ttyS0,115200 root=/dev/sda1 rw rootdelay=2 board=UBNT-RSPRO"
-  >> 
-3) Answer the remaining questions and write the changes to flash:
-  Update RedBoot non-volatile configuration - continue (y/n)? y
-  ... Erase from 0xbfff0000-0xc0000000: .
-  ... Program from 0x87ff0000-0x88000000 at 0xbfff0000: .
-4) Power cycle the board.
 

bitbake/AUTHORS

@@ -1,8 +1,8 @@
 Tim Ansell <mithro@mithis.net>
 Phil Blundell <pb@handhelds.org>
 Seb Frankengul <seb@frankengul.org>
-Holger Freyther <holger@moiji-mobile.com>
-Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
+Holger Freyther <zecke@handhelds.org>
+Marcin Juszkiewicz <hrw@hrw.one.pl>
 Chris Larson <kergoth@handhelds.org>
 Ulrich Luckas <luckas@musoft.de>
 Mickey Lauer <mickey@Vanille.de>

bitbake/ChangeLog

@@ -1,99 +1,5 @@
-Changes in Bitbake 1.9.x:
-	- Add PE (Package Epoch) support from Philipp Zabel (pH5)
-	- Treat python functions the same as shell functions for logging
-	- Use TMPDIR/anonfunc as a __anonfunc temp directory (T)
-	- Catch truncated cache file errors
-	- Allow operations other than assignment on flag variables
-	- Add code to handle inter-task dependencies
-	- Fix cache errors when generation dotGraphs
-	- Make sure __inherit_cache is updated before calling include() (from Michael Krelin)
-	- Fix bug when target was in ASSUME_PROVIDED (#2236)
-	- Raise ParseError for filenames with multiple underscores instead of infinitely looping (#2062)
-	- Fix invalid regexp in BBMASK error handling (missing import) (#1124)
-	- Promote certain warnings from debug to note 2 level
-	- Update manual
-	- Correctly redirect stdin when forking
-	- If parsing errors are found, exit, too many users miss the errors
-	- Remove supriours PREFERRED_PROVIDER warnings
-	- svn fetcher: Add _buildsvncommand function
-	- Improve certain error messages
-	- Rewrite svn fetcher to make adding extra operations easier 
-	  as part of future SRCDATE="now" fixes
-	  (requires new FETCHCMD_svn definition in bitbake.conf)
-	- Change SVNDIR layout to be more unique (fixes #2644 and #2624)
-	- Add ConfigParsed Event after configuration parsing is complete
-	- Add SRCREV support for svn fetcher
-	- data.emit_var() - only call getVar if we need the variable
-	- Stop generating the A variable (seems to be legacy code)
-	- Make sure intertask depends get processed correcting in recursive depends
-	- Add pn-PN to overrides when evaluating PREFERRED_VERSION
-	- Improve the progress indicator by skipping tasks that have 
-	  already run before starting the build rather than during it
-	- Add profiling option (-P)
-	- Add BB_SRCREV_POLICY variable (clear or cache) to control SRCREV cache
-	- Add SRCREV_FORMAT support
-	- Fix local fetcher's localpath return values
-	- Apply OVERRIDES before performing immediate expansions
-	- Allow the -b -e option combination to take regular expressions
-	- Fix handling of variables with expansion in the name using _append/_prepend
-	  e.g. RRECOMMENDS_${PN}_append_xyz = "abc"
-	- Add plain message function to bb.msg
-	- Sort the list of providers before processing so dependency problems are 
-	  reproducible rather than effectively random
-	- Fix/improve bitbake -s output
-	- Add locking for fetchers so only one tries to fetch a given file at a given time
-	- Fix int(0)/None confusion in runqueue.py which causes random gaps in dependency chains	  
-	- Expand data in addtasks
-	- Print the list of missing DEPENDS,RDEPENDS for the "No buildable providers available for required...."
-	  error message.
-	- Rework add_task to be more efficient (6% speedup, 7% number of function calls reduction)
-	- Sort digraph output to make builds more reproducible
-	- Split expandKeys into two for loops to benefit from the expand_cache (12% speedup)
-	- runqueue.py: Fix idepends handling to avoid dependency errors
-	- Clear the terminal TOSTOP flag if set (and warn the user)
-	- Fix regression from r653 and make SRCDATE/CVSDATE work for packages again
-	- Fix a bug in bb.decodeurl where http://some.where.com/somefile.tgz decoded to host="" (#1530)
-	- Warn about malformed PREFERRED_PROVIDERS (#1072)
-	- Add support for BB_NICE_LEVEL option (#1627)
-	- Psyco is used only on x86 as there is no support for other architectures.
-	- Sort initial providers list by default preference (#1145, #2024)
-	- Improve provider sorting so prefered versions have preference over latest versions (#768)
-	- Detect builds of tasks with overlapping providers and warn (will become a fatal error) (#1359)
-	- Add MULTI_PROVIDER_WHITELIST variable to allow known safe multiple providers to be listed
-	- Handle paths in svn fetcher module parameter
-	- Support the syntax "export VARIABLE"
-	- Add bzr fetcher
-	- Add support for cleaning directories before a task in the form:
-	  do_taskname[cleandirs] = "dir"
-	- bzr fetcher tweaks from Robert Schuster (#2913)
-	- Add mercurial (hg) fetcher from Robert Schuster (#2913)
-	- Don't add duplicates to BBPATH
-	- Fix preferred_version return values (providers.py)
-	- Fix 'depends' flag splitting
-	- Fix unexport handling (#3135)
-	- Add bb.copyfile function similar to bb.movefile (and improve movefile error reporting)
-	- Allow multiple options for deptask flag
-	- Use git-fetch instead of git-pull removing any need for merges when 
-	  fetching (we don't care about the index). Fixes fetch errors.
-	- Add BB_GENERATE_MIRROR_TARBALLS option, set to 0 to make git fetches 
-	  faster at the expense of not creating mirror tarballs.
-	- SRCREV handling updates, improvements and fixes from Poky
-	- Add bb.utils.lockfile() and bb.utils.unlockfile() from Poky
-	- Add support for task selfstamp and lockfiles flags
-	- Disable task number acceleration since it can allow the tasks to run 
-	  out of sequence
-	- Improve runqueue code comments
-	- Add task scheduler abstraction and some example schedulers
-	- Improve circular dependency chain debugging code and user feedback
-	- Don't give a stacktrace for invalid tasks, have a user friendly message (#3431)
-	- Add support for "-e target" (#3432)
-	- Fix shell showdata command (#3259)
-	- Fix shell data updating problems (#1880)
-	- Properly raise errors for invalid source URI protocols
-	- Change the wget fetcher failure handling to avoid lockfile problems
-	- Add support for branches in git fetcher (Otavio Salvador, Michael Lauer)
-	- Make taskdata and runqueue errors more user friendly
-	- Add norecurse and fullpath options to cvs fetcher
+Changes in BitBake 1.8.x:
+	- Fix -f (force) in conjunction with -b
 	- Fix exit code for build failures in --continue mode
 	- Fix git branch tags fetching
 	- Change parseConfigurationFile so it works on real data, not a copy
@@ -118,10 +24,8 @@ Changes in Bitbake 1.9.x:
 	  how extensively stamps are looked at for validity
 	- When handling build target failures make sure idepends are checked and
 	  failed where needed. Fixes --continue mode crashes.
-	- Fix -f (force) in conjunction with -b
 	- Fix problems with recrdeptask handling where some idepends weren't handled
 	  correctly.
-	- Handle exit codes correctly (from pH5)
 	- Work around refs/HEAD issues with git over http (#3410)
 	- Add proxy support to the CVS fetcher (from Cyril Chemparathy)
 	- Improve runfetchcmd so errors are seen and various GIT variables are exported
@@ -137,47 +41,109 @@ Changes in Bitbake 1.9.x:
 	- Add PERSISTENT_DIR to store the PersistData in a persistent
 	  directory != the cache dir.
 	- Add md5 and sha256 checksum generation functions to utils.py
-	- Correctly handle '-' characters in class names (#2958)
-	- Make sure expandKeys has been called on the data dictionary before running tasks
-	- Correctly add a task override in the form task-TASKNAME.
 	- Revert the '-' character fix in class names since it breaks things
-	- When a regexp fails to compile for PACKAGES_DYNAMIC, print a more useful error (#4444)
-	- Allow to checkout CVS by Date and Time. Just add HHmm to the SRCDATE.
-	- Move prunedir function to utils.py and add explode_dep_versions function
-	- Raise an exception if SRCREV == 'INVALID'
-	- Fix hg fetcher username/password handling and fix crash
-	- Fix PACKAGES_DYNAMIC handling of packages with '++' in the name
-	- Rename __depends to __base_depends after configuration parsing so we don't
-	  recheck the validity of the config files time after time
-	- Add better environmental variable handling. By default it will now only pass certain 
-	  whitelisted variables into the data store. If BB_PRESERVE_ENV is set bitbake will use
-	  all variable from the environment. If BB_ENV_WHITELIST is set, that whitelist will be
-	  used instead of the internal bitbake one. Alternatively, BB_ENV_EXTRAWHITE can be used
-	  to extend the internal whitelist.
-	- Perforce fetcher fix to use commandline options instead of being overriden by the environment
-	- bb.utils.prunedir can cope with symlinks to directoriees without exceptions
-	- use @rev when doing a svn checkout
-	- Add osc fetcher (from Joshua Lock in Poky)
-	- When SRCREV autorevisioning for a recipe is in use, don't cache the recipe
-	- Add tryaltconfigs option to control whether bitbake trys using alternative providers
-	  to fulfil failed dependencies. It defaults to off, changing the default since this
-	  behaviour confuses many users and isn't often useful.
-	- Improve lock file function error handling
-	- Add username handling to the git fetcher (Robert Bragg)
-	- Add support for HTTP_PROXY and HTTP_PROXY_IGNORE variables to the wget fetcher
-	- Export more variables to the fetcher commands to allow ssh checkouts and checkouts through 
-	  proxies to work better. (from Poky)
-	- Also allow user and pswd options in SRC_URIs globally (from Poky)
-	- Improve proxy handling when using mirrors (from Poky)
-	- Add bb.utils.prune_suffix function
-	- Fix hg checkouts of specific revisions (from Poky)
-	- Fix wget fetching of urls with parameters specified (from Poky)
-	- Add username handling to git fetcher (from Poky)
-	- Set HOME environmental variable when running fetcher commands (from Poky)
-	- Make sure allowed variables inherited from the environment are exported again (from Poky)
-	- When running a stage task in bbshell, run populate_staging, not the stage task (from Poky)
-	- Fix + character escaping from PACKAGES_DYNAMIC (thanks Otavio Salvador)
-	- Addition of BBCLASSEXTEND support for allowing one recipe to provide multiple targets (from Poky)
+
+Changes in BitBake 1.8.10:
+	- Psyco is available only for x86 - do not use it on other architectures.
+	- Fix a bug in bb.decodeurl where http://some.where.com/somefile.tgz decoded to host="" (#1530)
+	- Warn about malformed PREFERRED_PROVIDERS (#1072)
+	- Add support for BB_NICE_LEVEL option (#1627)
+	- Sort initial providers list by default preference (#1145, #2024)
+	- Improve provider sorting so prefered versions have preference over latest versions (#768)
+	- Detect builds of tasks with overlapping providers and warn (will become a fatal error) (#1359)
+	- Add MULTI_PROVIDER_WHITELIST variable to allow known safe multiple providers to be listed
+	- Handle paths in svn fetcher module parameter
+	- Support the syntax "export VARIABLE"
+	- Add bzr fetcher
+	- Add support for cleaning directories before a task in the form:
+	  do_taskname[cleandirs] = "dir"
+	- bzr fetcher tweaks from Robert Schuster (#2913)
+	- Add mercurial (hg) fetcher from Robert Schuster (#2913)
+	- Fix bogus preferred_version return values
+	- Fix 'depends' flag splitting
+	- Fix unexport handling (#3135)
+	- Add bb.copyfile function similar to bb.movefile (and improve movefile error reporting)
+	- Allow multiple options for deptask flag
+	- Use git-fetch instead of git-pull removing any need for merges when 
+	  fetching (we don't care about the index). Fixes fetch errors.
+	- Add BB_GENERATE_MIRROR_TARBALLS option, set to 0 to make git fetches 
+	  faster at the expense of not creating mirror tarballs.
+	- SRCREV handling updates, improvements and fixes from Poky
+	- Add bb.utils.lockfile() and bb.utils.unlockfile() from Poky
+	- Add support for task selfstamp and lockfiles flags
+	- Disable task number acceleration since it can allow the tasks to run 
+	  out of sequence
+	- Improve runqueue code comments
+	- Add task scheduler abstraction and some example schedulers
+	- Improve circular dependency chain debugging code and user feedback
+	- Don't give a stacktrace for invalid tasks, have a user friendly message (#3431)
+	- Add support for "-e target" (#3432)
+	- Fix shell showdata command (#3259)
+	- Fix shell data updating problems (#1880)
+	- Properly raise errors for invalid source URI protocols
+	- Change the wget fetcher failure handling to avoid lockfile problems
+	- Add git branch support
+	- Add support for branches in git fetcher (Otavio Salvador, Michael Lauer)
+	- Make taskdata and runqueue errors more user friendly
+	- Add norecurse and fullpath options to cvs fetcher
+
+Changes in Bitbake 1.8.8:
+	- Rewrite svn fetcher to make adding extra operations easier 
+	  as part of future SRCDATE="now" fixes
+	  (requires new FETCHCMD_svn definition in bitbake.conf)
+	- Change SVNDIR layout to be more unique (fixes #2644 and #2624)
+	- Import persistent data store from trunk
+	- Sync fetcher code with that in trunk, adding SRCREV support for svn
+	- Add ConfigParsed Event after configuration parsing is complete
+	- data.emit_var() - only call getVar if we need the variable
+	- Stop generating the A variable (seems to be legacy code)
+	- Make sure intertask depends get processed correcting in recursive depends
+	- Add pn-PN to overrides when evaluating PREFERRED_VERSION
+	- Improve the progress indicator by skipping tasks that have 
+	  already run before starting the build rather than during it
+	- Add profiling option (-P)
+	- Add BB_SRCREV_POLICY variable (clear or cache) to control SRCREV cache
+	- Add SRCREV_FORMAT support
+	- Fix local fetcher's localpath return values
+	- Apply OVERRIDES before performing immediate expansions
+	- Allow the -b -e option combination to take regular expressions
+	- Add plain message function to bb.msg
+	- Sort the list of providers before processing so dependency problems are 
+	  reproducible rather than effectively random
+	- Add locking for fetchers so only one tries to fetch a given file at a given time
+	- Fix int(0)/None confusion in runqueue.py which causes random gaps in dependency chains
+	- Fix handling of variables with expansion in the name using _append/_prepend
+	  e.g. RRECOMMENDS_${PN}_append_xyz = "abc"
+	- Expand data in addtasks
+ 	- Print the list of missing DEPENDS,RDEPENDS for the "No buildable providers available for required...."
+ 	  error message.
+	- Rework add_task to be more efficient (6% speedup, 7% number of function calls reduction)
+	- Sort digraph output to make builds more reproducible
+	- Split expandKeys into two for loops to benefit from the expand_cache (12% speedup)
+	- runqueue.py: Fix idepends handling to avoid dependency errors
+	- Clear the terminal TOSTOP flag if set (and warn the user)
+	- Fix regression from r653 and make SRCDATE/CVSDATE work for packages again
+
+Changes in Bitbake 1.8.6:
+	- Correctly redirect stdin when forking
+	- If parsing errors are found, exit, too many users miss the errors
+	- Remove supriours PREFERRED_PROVIDER warnings
+
+Changes in Bitbake 1.8.4:
+	- Make sure __inherit_cache is updated before calling include() (from Michael Krelin)
+	- Fix bug when target was in ASSUME_PROVIDED (#2236)
+	- Raise ParseError for filenames with multiple underscores instead of infinitely looping (#2062)
+	- Fix invalid regexp in BBMASK error handling (missing import) (#1124)
+	- Don't run build sanity checks on incomplete builds
+	- Promote certain warnings from debug to note 2 level
+	- Update manual
+
+Changes in Bitbake 1.8.2:
+	- Catch truncated cache file errors
+	- Add PE (Package Epoch) support from Philipp Zabel (pH5)
+	- Add code to handle inter-task dependencies
+	- Allow operations other than assignment on flag variables
+	- Fix cache errors when generation dotGraphs
 
 Changes in Bitbake 1.8.0:
 	- Release 1.7.x as a stable series

bitbake/LICENSE

@@ -1,10 +0,0 @@
-BitBake is licensed under the GNU General Public License version 2.0. See COPYING for further details.
-
-The following external components are distributed with this software:
-
-* The Toaster Simple UI application is based upon the Django project template, the files of which are covered by the BSD license and are copyright (c) Django Software
-Foundation and individual contributors.
-
-* Twitter Bootstrap (including Glyphicons), redistributed under the Apache License 2.0.
-
-* jQuery is redistributed under the MIT license.

bitbake/MANIFEST

@@ -0,0 +1,52 @@
+AUTHORS
+COPYING
+ChangeLog
+MANIFEST
+setup.py
+bin/bitdoc
+bin/bbimage
+bin/bitbake
+lib/bb/__init__.py
+lib/bb/build.py
+lib/bb/cache.py
+lib/bb/cooker.py
+lib/bb/COW.py
+lib/bb/data.py
+lib/bb/data_smart.py
+lib/bb/event.py
+lib/bb/fetch/__init__.py
+lib/bb/fetch/bzr.py
+lib/bb/fetch/cvs.py
+lib/bb/fetch/git.py
+lib/bb/fetch/hg.py
+lib/bb/fetch/local.py
+lib/bb/fetch/perforce.py
+lib/bb/fetch/ssh.py
+lib/bb/fetch/svk.py
+lib/bb/fetch/svn.py
+lib/bb/fetch/wget.py
+lib/bb/manifest.py
+lib/bb/methodpool.py
+lib/bb/msg.py
+lib/bb/parse/__init__.py
+lib/bb/parse/parse_py/__init__.py
+lib/bb/parse/parse_py/BBHandler.py
+lib/bb/parse/parse_py/ConfHandler.py
+lib/bb/persist_data.py
+lib/bb/providers.py
+lib/bb/runqueue.py
+lib/bb/shell.py
+lib/bb/taskdata.py
+lib/bb/utils.py
+setup.py
+doc/COPYING.GPL
+doc/COPYING.MIT
+doc/bitbake.1
+doc/manual/html.css
+doc/manual/Makefile
+doc/manual/usermanual.xml
+contrib/bbdev.sh
+contrib/vim/syntax/bitbake.vim
+contrib/vim/ftdetect/bitbake.vim
+conf/bitbake.conf
+classes/base.bbclass

bitbake/bin/bitbake

@@ -22,339 +22,113 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-import os
-import sys, logging
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(__file__)),
-                                'lib'))
-
-import optparse
-import warnings
-from traceback import format_exception
-try:
-    import bb
-except RuntimeError as exc:
-    sys.exit(str(exc))
-from bb import event
-import bb.msg
+import sys, os, getopt, re, time, optparse
+sys.path.insert(0,os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib'))
+import bb
 from bb import cooker
-from bb import ui
-from bb import server
-from bb import cookerdata
 
-__version__ = "1.21.1"
-logger = logging.getLogger("BitBake")
+__version__ = "1.8.11"
 
-# Python multiprocessing requires /dev/shm
-if not os.access('/dev/shm', os.W_OK | os.X_OK):
-    sys.exit("FATAL: /dev/shm does not exist or is not writable")
-
-# Unbuffer stdout to avoid log truncation in the event
-# of an unorderly exit as well as to provide timely
-# updates to log files for use with tail
-try:
-    if sys.stdout.name == '<stdout>':
-        sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0)
-except:
-    pass
-
-
-def get_ui(config):
-    if not config.ui:
-        # modify 'ui' attribute because it is also read by cooker
-        config.ui = os.environ.get('BITBAKE_UI', 'knotty')
-
-    interface = config.ui
-
-    try:
-        # Dynamically load the UI based on the ui name. Although we
-        # suggest a fixed set this allows you to have flexibility in which
-        # ones are available.
-        module = __import__("bb.ui", fromlist = [interface])
-        return getattr(module, interface)
-    except AttributeError:
-        sys.exit("FATAL: Invalid user interface '%s' specified.\n"
-                 "Valid interfaces: depexp, goggle, ncurses, hob, knotty [default]." % interface)
-
-
-# Display bitbake/OE warnings via the BitBake.Warnings logger, ignoring others"""
-warnlog = logging.getLogger("BitBake.Warnings")
-_warnings_showwarning = warnings.showwarning
-def _showwarning(message, category, filename, lineno, file=None, line=None):
-    if file is not None:
-        if _warnings_showwarning is not None:
-            _warnings_showwarning(message, category, filename, lineno, file, line)
-    else:
-        s = warnings.formatwarning(message, category, filename, lineno)
-        warnlog.warn(s)
-
-warnings.showwarning = _showwarning
-warnings.filterwarnings("ignore")
-warnings.filterwarnings("default", module="(<string>$|(oe|bb)\.)")
-warnings.filterwarnings("ignore", category=PendingDeprecationWarning)
-warnings.filterwarnings("ignore", category=ImportWarning)
-warnings.filterwarnings("ignore", category=DeprecationWarning, module="<string>$")
-warnings.filterwarnings("ignore", message="With-statements now directly support multiple context managers")
-
-class BitBakeConfigParameters(cookerdata.ConfigParameters):
-
-    def parseCommandLine(self):
-        parser = optparse.OptionParser(
-            version = "BitBake Build Tool Core version %s, %%prog version %s" % (bb.__version__, __version__),
-            usage = """%prog [options] [recipename/target ...]
-
-    Executes the specified task (default is 'build') for a given set of target recipes (.bb files).
-    It is assumed there is a conf/bblayers.conf available in cwd or in BBPATH which
-    will provide the layer, BBFILES and other configuration information.""")
-
-        parser.add_option("-b", "--buildfile", help = "Execute tasks from a specific .bb recipe directly. WARNING: Does not handle any dependencies from other recipes.",
-                   action = "store", dest = "buildfile", default = None)
-
-        parser.add_option("-k", "--continue", help = "Continue as much as possible after an error. While the target that failed and anything depending on it cannot be built, as much as possible will be built before stopping.",
-                   action = "store_false", dest = "abort", default = True)
-
-        parser.add_option("-a", "--tryaltconfigs", help = "Continue with builds by trying to use alternative providers where possible.",
-                   action = "store_true", dest = "tryaltconfigs", default = False)
-
-        parser.add_option("-f", "--force", help = "Force the specified targets/task to run (invalidating any existing stamp file).",
-                   action = "store_true", dest = "force", default = False)
-
-        parser.add_option("-c", "--cmd", help = "Specify the task to execute. The exact options available depend on the metadata. Some examples might be 'compile' or 'populate_sysroot' or 'listtasks' may give a list of the tasks available.",
-                   action = "store", dest = "cmd")
-
-        parser.add_option("-C", "--clear-stamp", help = "Invalidate the stamp for the specified task such as 'compile' and then run the default task for the specified target(s).",
-                    action = "store", dest = "invalidate_stamp")
-
-        parser.add_option("-r", "--read", help = "Read the specified file before bitbake.conf.",
-                   action = "append", dest = "prefile", default = [])
-
-        parser.add_option("-R", "--postread", help = "Read the specified file after bitbake.conf.",
-                          action = "append", dest = "postfile", default = [])
-
-        parser.add_option("-v", "--verbose", help = "Output more log message data to the terminal.",
-                   action = "store_true", dest = "verbose", default = False)
-
-        parser.add_option("-D", "--debug", help = "Increase the debug level. You can specify this more than once.",
-                   action = "count", dest="debug", default = 0)
-
-        parser.add_option("-n", "--dry-run", help = "Don't execute, just go through the motions.",
-                   action = "store_true", dest = "dry_run", default = False)
-
-        parser.add_option("-S", "--dump-signatures", help = "Don't execute, just dump out the signature construction information.",
-                   action = "store_true", dest = "dump_signatures", default = False)
-
-        parser.add_option("-p", "--parse-only", help = "Quit after parsing the BB recipes.",
-                   action = "store_true", dest = "parse_only", default = False)
-
-        parser.add_option("-s", "--show-versions", help = "Show current and preferred versions of all recipes.",
-                   action = "store_true", dest = "show_versions", default = False)
-
-        parser.add_option("-e", "--environment", help = "Show the global or per-package environment complete with information about where variables were set/changed.",
-                   action = "store_true", dest = "show_environment", default = False)
-
-        parser.add_option("-g", "--graphviz", help = "Save dependency tree information for the specified targets in the dot syntax.",
-                    action = "store_true", dest = "dot_graph", default = False)
-
-        parser.add_option("-I", "--ignore-deps", help = """Assume these dependencies don't exist and are already provided (equivalent to ASSUME_PROVIDED). Useful to make dependency graphs more appealing""",
-                    action = "append", dest = "extra_assume_provided", default = [])
-
-        parser.add_option("-l", "--log-domains", help = """Show debug logging for the specified logging domains""",
-                    action = "append", dest = "debug_domains", default = [])
-
-        parser.add_option("-P", "--profile", help = "Profile the command and save reports.",
-                   action = "store_true", dest = "profile", default = False)
-
-        parser.add_option("-u", "--ui", help = "The user interface to use (e.g. knotty, hob, depexp).",
-                   action = "store", dest = "ui")
-
-        parser.add_option("-t", "--servertype", help = "Choose which server to use, process or xmlrpc.",
-                   action = "store", dest = "servertype")
-
-        parser.add_option("", "--revisions-changed", help = "Set the exit code depending on whether upstream floating revisions have changed or not.",
-                   action = "store_true", dest = "revisions_changed", default = False)
-
-        parser.add_option("", "--server-only", help = "Run bitbake without a UI, only starting a server (cooker) process.",
-                   action = "store_true", dest = "server_only", default = False)
-
-        parser.add_option("-B", "--bind", help = "The name/address for the bitbake server to bind to.",
-                   action = "store", dest = "bind", default = False)
-
-        parser.add_option("", "--no-setscene", help = "Do not run any setscene tasks. sstate will be ignored and everything needed, built.",
-                   action = "store_true", dest = "nosetscene", default = False)
-
-        parser.add_option("", "--remote-server", help = "Connect to the specified server.",
-                   action = "store", dest = "remote_server", default = False)
-
-        parser.add_option("-m", "--kill-server", help = "Terminate the remote server.",
-                    action = "store_true", dest = "kill_server", default = False)
-
-        parser.add_option("", "--observe-only", help = "Connect to a server as an observing-only client.",
-                   action = "store_true", dest = "observe_only", default = False)
-
-        parser.add_option("", "--status-only", help = "Check the status of the remote bitbake server.",
-                   action = "store_true", dest = "status_only", default = False)
-
-        options, targets = parser.parse_args(sys.argv)
-
-        # some environmental variables set also configuration options
-        if "BBSERVER" in os.environ:
-            options.servertype = "xmlrpc"
-            options.remote_server = os.environ["BBSERVER"]
-
-        return options, targets[1:]
-
-
-def start_server(servermodule, configParams, configuration):
-    server = servermodule.BitBakeServer()
-    if configParams.bind:
-        (host, port) = configParams.bind.split(':')
-        server.initServer((host, int(port)))
-        configuration.interface = [ server.serverImpl.host, server.serverImpl.port ]
-    else:
-        server.initServer()
-        configuration.interface = []
-
-    try:
-        configuration.setServerRegIdleCallback(server.getServerIdleCB())
-
-        cooker = bb.cooker.BBCooker(configuration)
-
-        server.addcooker(cooker)
-        server.saveConnectionDetails()
-    except Exception as e:
-        exc_info = sys.exc_info()
-        while True:
-            try:
-                import queue
-            except ImportError:
-                import Queue as queue
-            try:
-                event = server.event_queue.get(block=False)
-            except (queue.Empty, IOError):
-                break
-            if isinstance(event, logging.LogRecord):
-                logger.handle(event)
-        raise exc_info[1], None, exc_info[2]
-    server.detach()
-    return server
+#============================================================================#
+# BBOptions
+#============================================================================#
+class BBConfiguration( object ):
+    """
+    Manages build options and configurations for one run
+    """
+    def __init__( self, options ):
+        for key, val in options.__dict__.items():
+            setattr( self, key, val )
 
 
+#============================================================================#
+# main
+#============================================================================#
 
 def main():
+    parser = optparse.OptionParser( version = "BitBake Build Tool Core version %s, %%prog version %s" % ( bb.__version__, __version__ ),
+    usage = """%prog [options] [package ...]
 
-    configParams = BitBakeConfigParameters()
-    configuration = cookerdata.CookerConfiguration()
-    configuration.setConfigParameters(configParams)
+Executes the specified task (default is 'build') for a given set of BitBake files.
+It expects that BBFILES is defined, which is a space separated list of files to
+be executed.  BBFILES does support wildcards.
+Default BBFILES are the .bb files in the current directory.""" )
 
-    ui_module = get_ui(configParams)
+    parser.add_option( "-b", "--buildfile", help = "execute the task against this .bb file, rather than a package from BBFILES.",
+               action = "store", dest = "buildfile", default = None )
 
-    # Server type can be xmlrpc or process currently, if nothing is specified,
-    # the default server is process
-    if configParams.servertype:
-        server_type = configParams.servertype
-    else:
-        server_type = 'process'
+    parser.add_option( "-k", "--continue", help = "continue as much as possible after an error. While the target that failed, and those that depend on it, cannot be remade, the other dependencies of these targets can be processed all the same.",
+               action = "store_false", dest = "abort", default = True )
 
-    try:
-        module = __import__("bb.server", fromlist = [server_type])
-        servermodule = getattr(module, server_type)
-    except AttributeError:
-        sys.exit("FATAL: Invalid server type '%s' specified.\n"
-                 "Valid interfaces: xmlrpc, process [default]." % servertype)
+    parser.add_option( "-f", "--force", help = "force run of specified cmd, regardless of stamp status",
+               action = "store_true", dest = "force", default = False )
 
-    if configParams.server_only:
-        if configParams.servertype != "xmlrpc":
-            sys.exit("FATAL: If '--server-only' is defined, we must set the servertype as 'xmlrpc'.\n")
-        if not configParams.bind:
-            sys.exit("FATAL: The '--server-only' option requires a name/address to bind to with the -B option.\n")
-        if configParams.remote_server:
-            sys.exit("FATAL: The '--server-only' option conflicts with %s.\n" % 
-                ("the BBSERVER environment variable" if "BBSERVER" in os.environ else "the '--remote-server' option" ))
+    parser.add_option( "-i", "--interactive", help = "drop into the interactive mode also called the BitBake shell.",
+               action = "store_true", dest = "interactive", default = False )
 
-    if configParams.bind and configParams.servertype != "xmlrpc":
-        sys.exit("FATAL: If '-B' or '--bind' is defined, we must set the servertype as 'xmlrpc'.\n")
+    parser.add_option( "-c", "--cmd", help = "Specify task to execute. Note that this only executes the specified task for the providee and the packages it depends on, i.e. 'compile' does not implicitly call stage for the dependencies (IOW: use only if you know what you are doing). Depending on the base.bbclass a listtasks tasks is defined and will show available tasks",
+               action = "store", dest = "cmd" )
 
-    if configParams.remote_server and configParams.servertype != "xmlrpc":
-        sys.exit("FATAL: If '--remote-server' is defined, we must set the servertype as 'xmlrpc'.\n")
+    parser.add_option( "-r", "--read", help = "read the specified file before bitbake.conf",
+               action = "append", dest = "file", default = [] )
 
-    if configParams.observe_only and (not configParams.remote_server or configParams.bind):
-        sys.exit("FATAL: '--observe-only' can only be used by UI clients connecting to a server.\n")
+    parser.add_option( "-v", "--verbose", help = "output more chit-chat to the terminal",
+               action = "store_true", dest = "verbose", default = False )
 
-    if "BBDEBUG" in os.environ:
-        level = int(os.environ["BBDEBUG"])
-        if level > configuration.debug:
-            configuration.debug = level
+    parser.add_option( "-D", "--debug", help = "Increase the debug level. You can specify this more than once.",
+               action = "count", dest="debug", default = 0)
 
-    bb.msg.init_msgconfig(configParams.verbose, configuration.debug,
-                         configuration.debug_domains)
+    parser.add_option( "-n", "--dry-run", help = "don't execute, just go through the motions",
+               action = "store_true", dest = "dry_run", default = False )
 
-    # Ensure logging messages get sent to the UI as events
-    handler = bb.event.LogHandler()
-    if not configParams.status_only:
-        # In status only mode there are no logs and no UI
-        logger.addHandler(handler)
+    parser.add_option( "-p", "--parse-only", help = "quit after parsing the BB files (developers only)",
+               action = "store_true", dest = "parse_only", default = False )
 
-    # Clear away any spurious environment variables while we stoke up the cooker
-    cleanedvars = bb.utils.clean_environment()
+    parser.add_option( "-d", "--disable-psyco", help = "disable using the psyco just-in-time compiler (not recommended)",
+               action = "store_true", dest = "disable_psyco", default = False )
 
-    if not configParams.remote_server:
-        # we start a server with a given configuration
-        server = start_server(servermodule, configParams, configuration)
-        bb.event.ui_queue = []
-    else:
-        # we start a stub server that is actually a XMLRPClient that connects to a real server
-        server = servermodule.BitBakeXMLRPCClient(configParams.observe_only)
-        server.saveConnectionDetails(configParams.remote_server)
-        server.saveConnectionConfigParams(configParams)
+    parser.add_option( "-s", "--show-versions", help = "show current and preferred versions of all packages",
+               action = "store_true", dest = "show_versions", default = False )
 
-    if not configParams.server_only:
-        # Collect the feature set for the UI
-        featureset = getattr(ui_module, "featureSet", [])
+    parser.add_option( "-e", "--environment", help = "show the global or per-package environment (this is what used to be bbread)",
+               action = "store_true", dest = "show_environment", default = False )
 
-        if configParams.status_only:
-            try:
-                server_connection = server.establishConnection(featureset)
-            except:
-                sys.exit(1)
-            if not server_connection:
-                sys.exit(1)
-            server_connection.terminate()
-            sys.exit(0)
+    parser.add_option( "-g", "--graphviz", help = "emit the dependency trees of the specified packages in the dot syntax",
+                action = "store_true", dest = "dot_graph", default = False )
 
-        # Setup a connection to the server (cooker)
-        server_connection = server.establishConnection(featureset)
-        if not server_connection:
-            if configParams.kill_server:
-                bb.fatal("Server already killed")
-            configParams.bind = configParams.remote_server
-            start_server(servermodule, configParams, configuration)
-            bb.event.ui_queue = []
-            server_connection = server.establishConnection(featureset)
+    parser.add_option( "-I", "--ignore-deps", help = """Stop processing at the given list of dependencies when generating dependency graphs. This can help to make the graph more appealing""",
+                action = "append", dest = "ignored_dot_deps", default = [] )
 
-        # Restore the environment in case the UI needs it
-        for k in cleanedvars:
-            os.environ[k] = cleanedvars[k]
+    parser.add_option( "-l", "--log-domains", help = """Show debug logging for the specified logging domains""",
+                action = "append", dest = "debug_domains", default = [] )
 
-        logger.removeHandler(handler)
+    parser.add_option( "-P", "--profile", help = "profile the command and print a report",
+               action = "store_true", dest = "profile", default = False )
 
+    options, args = parser.parse_args(sys.argv)
+
+    configuration = BBConfiguration(options)
+    configuration.pkgs_to_build = []
+    configuration.pkgs_to_build.extend(args[1:])
+
+    cooker = bb.cooker.BBCooker(configuration)
+
+    if configuration.profile:
         try:
-            return ui_module.main(server_connection.connection, server_connection.events, configParams)
-        finally:
-            bb.event.ui_queue = []
-            server_connection.terminate()
-    else:
-        print("server address: %s, server port: %s" % (server.serverImpl.host, server.serverImpl.port))
-        return 0
+            import cProfile as profile
+        except:
+            import profile
 
-    return 1
+        profile.runctx("cooker.cook()", globals(), locals(), "profile.log")
+        import pstats
+        p = pstats.Stats('profile.log')
+        p.sort_stats('time')
+        p.print_stats()
+        p.print_callers()
+        p.sort_stats('cumulative')
+        p.print_stats()
+    else:
+        cooker.cook()
 
 if __name__ == "__main__":
-    try:
-        ret = main()
-    except bb.BBHandledException:
-        ret = 1
-    except Exception:
-        ret = 1
-        import traceback
-        traceback.print_exc()
-    sys.exit(ret)
-
+    main()

bitbake/bin/bitbake-diffsigs

@@ -1,122 +0,0 @@
-#!/usr/bin/env python
-
-# bitbake-diffsigs
-# BitBake task signature data comparison utility
-#
-# Copyright (C) 2012-2013 Intel Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import os
-import sys
-import warnings
-import fnmatch
-import optparse
-import logging
-
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib'))
-
-import bb.tinfoil
-import bb.siggen
-
-def logger_create(name, output=sys.stderr):
-    logger = logging.getLogger(name)
-    console = logging.StreamHandler(output)
-    format = bb.msg.BBLogFormatter("%(levelname)s: %(message)s")
-    if output.isatty():
-        format.enable_color()
-    console.setFormatter(format)
-    logger.addHandler(console)
-    logger.setLevel(logging.INFO)
-    return logger
-
-logger = logger_create('bitbake-diffsigs')
-
-def find_compare_task(bbhandler, pn, taskname):
-    """ Find the most recent signature files for the specified PN/task and compare them """
-
-    if not hasattr(bb.siggen, 'find_siginfo'):
-        logger.error('Metadata does not support finding signature data files')
-        sys.exit(1)
-
-    if not taskname.startswith('do_'):
-        taskname = 'do_%s' % taskname
-
-    filedates = bb.siggen.find_siginfo(pn, taskname, None, bbhandler.config_data)
-    latestfiles = sorted(filedates.keys(), key=lambda f: filedates[f])[-2:]
-    if not latestfiles:
-        logger.error('No sigdata files found matching %s %s' % (pn, taskname))
-        sys.exit(1)
-    elif len(latestfiles) < 2:
-        logger.error('Only one matching sigdata file found for the specified task (%s %s)' % (pn, taskname))
-        sys.exit(1)
-    else:
-        # Define recursion callback
-        def recursecb(key, hash1, hash2):
-            hashes = [hash1, hash2]
-            hashfiles = bb.siggen.find_siginfo(key, None, hashes, bbhandler.config_data)
-
-            recout = []
-            if len(hashfiles) == 2:
-                out2 = bb.siggen.compare_sigfiles(hashfiles[hash1], hashfiles[hash2], recursecb)
-                recout.extend(list('  ' + l for l in out2))
-            else:
-                recout.append("Unable to find matching sigdata for %s with hashes %s or %s" % (key, hash1, hash2))
-
-            return recout
-
-        # Recurse into signature comparison
-        output = bb.siggen.compare_sigfiles(latestfiles[0], latestfiles[1], recursecb)
-        if output:
-            print '\n'.join(output)
-    sys.exit(0)
-
-
-
-parser = optparse.OptionParser(
-    description = "Compares siginfo/sigdata files written out by BitBake",
-    usage = """
-  %prog -t recipename taskname
-  %prog sigdatafile1 sigdatafile2
-  %prog sigdatafile1""")
-
-parser.add_option("-t", "--task",
-        help = "find the signature data files for last two runs of the specified task and compare them",
-        action="store", dest="taskargs", nargs=2, metavar='recipename taskname')
-
-options, args = parser.parse_args(sys.argv)
-
-if options.taskargs:
-    tinfoil = bb.tinfoil.Tinfoil()
-    tinfoil.prepare(config_only = True)
-    find_compare_task(tinfoil, options.taskargs[0], options.taskargs[1])
-else:
-    if len(args) == 1:
-        parser.print_help()
-    else:
-        import cPickle
-        try:
-            if len(args) == 2:
-                output = bb.siggen.dump_sigfile(sys.argv[1])
-            else:
-                output = bb.siggen.compare_sigfiles(sys.argv[1], sys.argv[2])
-        except IOError as e:
-            logger.error(str(e))
-            sys.exit(1)
-        except cPickle.UnpicklingError, EOFError:
-            logger.error('Invalid signature data - ensure you are specifying sigdata/siginfo files')
-            sys.exit(1)
-
-    if output:
-        print '\n'.join(output)

bitbake/bin/bitbake-dumpsig

@@ -1,65 +0,0 @@
-#!/usr/bin/env python
-
-# bitbake-dumpsig
-# BitBake task signature dump utility
-#
-# Copyright (C) 2013 Intel Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import os
-import sys
-import warnings
-import optparse
-import logging
-
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib'))
-
-import bb.siggen
-
-def logger_create(name, output=sys.stderr):
-    logger = logging.getLogger(name)
-    console = logging.StreamHandler(output)
-    format = bb.msg.BBLogFormatter("%(levelname)s: %(message)s")
-    if output.isatty():
-        format.enable_color()
-    console.setFormatter(format)
-    logger.addHandler(console)
-    logger.setLevel(logging.INFO)
-    return logger
-
-logger = logger_create('bitbake-dumpsig')
-
-parser = optparse.OptionParser(
-    description = "Dumps siginfo/sigdata files written out by BitBake",
-    usage = """
-  %prog sigdatafile""")
-
-options, args = parser.parse_args(sys.argv)
-
-if len(args) == 1:
-    parser.print_help()
-else:
-    import cPickle
-    try:
-        output = bb.siggen.dump_sigfile(args[1])
-    except IOError as e:
-        logger.error(str(e))
-        sys.exit(1)
-    except cPickle.UnpicklingError, EOFError:
-        logger.error('Invalid signature data - ensure you are specifying a sigdata/siginfo file')
-        sys.exit(1)
-
-    if output:
-        print '\n'.join(output)

bitbake/bin/bitbake-layers

@@ -1,726 +0,0 @@
-#!/usr/bin/env python
-
-# This script has subcommands which operate against your bitbake layers, either
-# displaying useful information, or acting against them.
-# See the help output for details on available commands.
-
-# Copyright (C) 2011 Mentor Graphics Corporation
-# Copyright (C) 2012 Intel Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import cmd
-import logging
-import os
-import sys
-import fnmatch
-from collections import defaultdict
-import re
-
-bindir = os.path.dirname(__file__)
-topdir = os.path.dirname(bindir)
-sys.path[0:0] = [os.path.join(topdir, 'lib')]
-
-import bb.cache
-import bb.cooker
-import bb.providers
-import bb.utils
-import bb.tinfoil
-
-
-logger = logging.getLogger('BitBake')
-
-
-def main(args):
-    cmds = Commands()
-    if args:
-        # Allow user to specify e.g. show-layers instead of show_layers
-        args = [args[0].replace('-', '_')] + args[1:]
-        cmds.onecmd(' '.join(args))
-    else:
-        cmds.do_help('')
-    return cmds.returncode
-
-
-class Commands(cmd.Cmd):
-    def __init__(self):
-        self.bbhandler = None
-        self.returncode = 0
-        self.bblayers = []
-        cmd.Cmd.__init__(self)
-
-    def init_bbhandler(self, config_only = False):
-        if not self.bbhandler:
-            self.bbhandler = bb.tinfoil.Tinfoil()
-            self.bblayers = (self.bbhandler.config_data.getVar('BBLAYERS', True) or "").split()
-            self.bbhandler.prepare(config_only)
-
-    def default(self, line):
-        """Handle unrecognised commands"""
-        sys.stderr.write("Unrecognised command or option\n")
-        self.do_help('')
-
-    def do_help(self, topic):
-        """display general help or help on a specified command"""
-        if topic:
-            sys.stdout.write('%s: ' % topic)
-            cmd.Cmd.do_help(self, topic.replace('-', '_'))
-        else:
-            sys.stdout.write("usage: bitbake-layers <command> [arguments]\n\n")
-            sys.stdout.write("Available commands:\n")
-            procnames = list(set(self.get_names()))
-            for procname in procnames:
-                if procname[:3] == 'do_':
-                    sys.stdout.write("  %s\n" % procname[3:].replace('_', '-'))
-                    doc = getattr(self, procname).__doc__
-                    if doc:
-                        sys.stdout.write("    %s\n" % doc.splitlines()[0])
-
-    def do_show_layers(self, args):
-        """show current configured layers"""
-        self.init_bbhandler(config_only = True)
-        logger.plain("%s  %s  %s" % ("layer".ljust(20), "path".ljust(40), "priority"))
-        logger.plain('=' * 74)
-        for layerdir in self.bblayers:
-            layername = self.get_layer_name(layerdir)
-            layerpri = 0
-            for layer, _, regex, pri in self.bbhandler.cooker.recipecache.bbfile_config_priorities:
-                if regex.match(os.path.join(layerdir, 'test')):
-                    layerpri = pri
-                    break
-
-            logger.plain("%s  %s  %d" % (layername.ljust(20), layerdir.ljust(40), layerpri))
-
-
-    def version_str(self, pe, pv, pr = None):
-        verstr = "%s" % pv
-        if pr:
-            verstr = "%s-%s" % (verstr, pr)
-        if pe:
-            verstr = "%s:%s" % (pe, verstr)
-        return verstr
-
-
-    def do_show_overlayed(self, args):
-        """list overlayed recipes (where the same recipe exists in another layer)
-
-usage: show-overlayed [-f] [-s]
-
-Lists the names of overlayed recipes and the available versions in each
-layer, with the preferred version first. Note that skipped recipes that
-are overlayed will also be listed, with a " (skipped)" suffix.
-
-Options:
-  -f   instead of the default formatting, list filenames of higher priority
-       recipes with the ones they overlay indented underneath
-  -s   only list overlayed recipes where the version is the same
-"""
-        self.init_bbhandler()
-
-        show_filenames = False
-        show_same_ver_only = False
-        for arg in args.split():
-            if arg == '-f':
-                show_filenames = True
-            elif arg == '-s':
-                show_same_ver_only = True
-            else:
-                sys.stderr.write("show-overlayed: invalid option %s\n" % arg)
-                self.do_help('')
-                return
-
-        items_listed = self.list_recipes('Overlayed recipes', None, True, show_same_ver_only, show_filenames, True)
-
-        # Check for overlayed .bbclass files
-        classes = defaultdict(list)
-        for layerdir in self.bblayers:
-            classdir = os.path.join(layerdir, 'classes')
-            if os.path.exists(classdir):
-                for classfile in os.listdir(classdir):
-                    if os.path.splitext(classfile)[1] == '.bbclass':
-                        classes[classfile].append(classdir)
-
-        # Locating classes and other files is a bit more complicated than recipes -
-        # layer priority is not a factor; instead BitBake uses the first matching
-        # file in BBPATH, which is manipulated directly by each layer's
-        # conf/layer.conf in turn, thus the order of layers in bblayers.conf is a
-        # factor - however, each layer.conf is free to either prepend or append to
-        # BBPATH (or indeed do crazy stuff with it). Thus the order in BBPATH might
-        # not be exactly the order present in bblayers.conf either.
-        bbpath = str(self.bbhandler.config_data.getVar('BBPATH', True))
-        overlayed_class_found = False
-        for (classfile, classdirs) in classes.items():
-            if len(classdirs) > 1:
-                if not overlayed_class_found:
-                    logger.plain('=== Overlayed classes ===')
-                    overlayed_class_found = True
-
-                mainfile = bb.utils.which(bbpath, os.path.join('classes', classfile))
-                if show_filenames:
-                    logger.plain('%s' % mainfile)
-                else:
-                    # We effectively have to guess the layer here
-                    logger.plain('%s:' % classfile)
-                    mainlayername = '?'
-                    for layerdir in self.bblayers:
-                        classdir = os.path.join(layerdir, 'classes')
-                        if mainfile.startswith(classdir):
-                            mainlayername = self.get_layer_name(layerdir)
-                    logger.plain('  %s' % mainlayername)
-                for classdir in classdirs:
-                    fullpath = os.path.join(classdir, classfile)
-                    if fullpath != mainfile:
-                        if show_filenames:
-                            print('  %s' % fullpath)
-                        else:
-                            print('  %s' % self.get_layer_name(os.path.dirname(classdir)))
-
-        if overlayed_class_found:
-            items_listed = True;
-
-        if not items_listed:
-            logger.plain('No overlayed files found.')
-
-
-    def do_show_recipes(self, args):
-        """list available recipes, showing the layer they are provided by
-
-usage: show-recipes [-f] [-m] [pnspec]
-
-Lists the names of overlayed recipes and the available versions in each
-layer, with the preferred version first. Optionally you may specify
-pnspec to match a specified recipe name (supports wildcards). Note that
-skipped recipes will also be listed, with a " (skipped)" suffix.
-
-Options:
-  -f   instead of the default formatting, list filenames of higher priority
-       recipes with other available recipes indented underneath
-  -m   only list where multiple recipes (in the same layer or different
-       layers) exist for the same recipe name
-"""
-        self.init_bbhandler()
-
-        show_filenames = False
-        show_multi_provider_only = False
-        pnspec = None
-        title = 'Available recipes:'
-        for arg in args.split():
-            if arg == '-f':
-                show_filenames = True
-            elif arg == '-m':
-                show_multi_provider_only = True
-            elif not arg.startswith('-'):
-                pnspec = arg
-                title = 'Available recipes matching %s:' % pnspec
-            else:
-                sys.stderr.write("show-recipes: invalid option %s\n" % arg)
-                self.do_help('')
-                return
-        self.list_recipes(title, pnspec, False, False, show_filenames, show_multi_provider_only)
-
-
-    def list_recipes(self, title, pnspec, show_overlayed_only, show_same_ver_only, show_filenames, show_multi_provider_only):
-        pkg_pn = self.bbhandler.cooker.recipecache.pkg_pn
-        (latest_versions, preferred_versions) = bb.providers.findProviders(self.bbhandler.config_data, self.bbhandler.cooker.recipecache, pkg_pn)
-        allproviders = bb.providers.allProviders(self.bbhandler.cooker.recipecache)
-
-        # Ensure we list skipped recipes
-        # We are largely guessing about PN, PV and the preferred version here,
-        # but we have no choice since skipped recipes are not fully parsed
-        skiplist = self.bbhandler.cooker.skiplist.keys()
-        skiplist.sort( key=lambda fileitem: self.bbhandler.cooker.collection.calc_bbfile_priority(fileitem) )
-        skiplist.reverse()
-        for fn in skiplist:
-            recipe_parts = os.path.splitext(os.path.basename(fn))[0].split('_')
-            p = recipe_parts[0]
-            if len(recipe_parts) > 1:
-                ver = (None, recipe_parts[1], None)
-            else:
-                ver = (None, 'unknown', None)
-            allproviders[p].append((ver, fn))
-            if not p in pkg_pn:
-                pkg_pn[p] = 'dummy'
-                preferred_versions[p] = (ver, fn)
-
-        def print_item(f, pn, ver, layer, ispref):
-            if f in skiplist:
-                skipped = ' (skipped)'
-            else:
-                skipped = ''
-            if show_filenames:
-                if ispref:
-                    logger.plain("%s%s", f, skipped)
-                else:
-                    logger.plain("  %s%s", f, skipped)
-            else:
-                if ispref:
-                    logger.plain("%s:", pn)
-                logger.plain("  %s %s%s", layer.ljust(20), ver, skipped)
-
-        preffiles = []
-        items_listed = False
-        for p in sorted(pkg_pn):
-            if pnspec:
-                if not fnmatch.fnmatch(p, pnspec):
-                    continue
-
-            if len(allproviders[p]) > 1 or not show_multi_provider_only:
-                pref = preferred_versions[p]
-                preffile = bb.cache.Cache.virtualfn2realfn(pref[1])[0]
-                if preffile not in preffiles:
-                    preflayer = self.get_file_layer(preffile)
-                    multilayer = False
-                    same_ver = True
-                    provs = []
-                    for prov in allproviders[p]:
-                        provfile = bb.cache.Cache.virtualfn2realfn(prov[1])[0]
-                        provlayer = self.get_file_layer(provfile)
-                        provs.append((provfile, provlayer, prov[0]))
-                        if provlayer != preflayer:
-                            multilayer = True
-                        if prov[0] != pref[0]:
-                            same_ver = False
-
-                    if (multilayer or not show_overlayed_only) and (same_ver or not show_same_ver_only):
-                        if not items_listed:
-                            logger.plain('=== %s ===' % title)
-                            items_listed = True
-                        print_item(preffile, p, self.version_str(pref[0][0], pref[0][1]), preflayer, True)
-                        for (provfile, provlayer, provver) in provs:
-                            if provfile != preffile:
-                                print_item(provfile, p, self.version_str(provver[0], provver[1]), provlayer, False)
-                        # Ensure we don't show two entries for BBCLASSEXTENDed recipes
-                        preffiles.append(preffile)
-
-        return items_listed
-
-
-    def do_flatten(self, args):
-        """flattens layer configuration into a separate output directory.
-
-usage: flatten [layer1 layer2 [layer3]...] <outputdir>
-
-Takes the specified layers (or all layers in the current layer
-configuration if none are specified) and builds a "flattened" directory
-containing the contents of all layers, with any overlayed recipes removed
-and bbappends appended to the corresponding recipes. Note that some manual
-cleanup may still be necessary afterwards, in particular:
-
-* where non-recipe files (such as patches) are overwritten (the flatten
-  command will show a warning for these)
-* where anything beyond the normal layer setup has been added to
-  layer.conf (only the lowest priority number layer's layer.conf is used)
-* overridden/appended items from bbappends will need to be tidied up
-* when the flattened layers do not have the same directory structure (the
-  flatten command should show a warning when this will cause a problem)
-
-Warning: if you flatten several layers where another layer is intended to
-be used "inbetween" them (in layer priority order) such that recipes /
-bbappends in the layers interact, and then attempt to use the new output
-layer together with that other layer, you may no longer get the same
-build results (as the layer priority order has effectively changed).
-"""
-        arglist = args.split()
-        if len(arglist) < 1:
-            logger.error('Please specify an output directory')
-            self.do_help('flatten')
-            return
-
-        if len(arglist) == 2:
-            logger.error('If you specify layers to flatten you must specify at least two')
-            self.do_help('flatten')
-            return
-
-        outputdir = arglist[-1]
-        if os.path.exists(outputdir) and os.listdir(outputdir):
-            logger.error('Directory %s exists and is non-empty, please clear it out first' % outputdir)
-            return
-
-        self.init_bbhandler()
-        layers = self.bblayers
-        if len(arglist) > 2:
-            layernames = arglist[:-1]
-            found_layernames = []
-            found_layerdirs = []
-            for layerdir in layers:
-                layername = self.get_layer_name(layerdir)
-                if layername in layernames:
-                    found_layerdirs.append(layerdir)
-                    found_layernames.append(layername)
-
-            for layername in layernames:
-                if not layername in found_layernames:
-                    logger.error('Unable to find layer %s in current configuration, please run "%s show-layers" to list configured layers' % (layername, os.path.basename(sys.argv[0])))
-                    return
-            layers = found_layerdirs
-        else:
-            layernames = []
-
-        # Ensure a specified path matches our list of layers
-        def layer_path_match(path):
-            for layerdir in layers:
-                if path.startswith(os.path.join(layerdir, '')):
-                    return layerdir
-            return None
-
-        appended_recipes = []
-        for layer in layers:
-            overlayed = []
-            for f in self.bbhandler.cooker.collection.overlayed.iterkeys():
-                for of in self.bbhandler.cooker.collection.overlayed[f]:
-                    if of.startswith(layer):
-                        overlayed.append(of)
-
-            logger.plain('Copying files from %s...' % layer )
-            for root, dirs, files in os.walk(layer):
-                for f1 in files:
-                    f1full = os.sep.join([root, f1])
-                    if f1full in overlayed:
-                        logger.plain('  Skipping overlayed file %s' % f1full )
-                    else:
-                        ext = os.path.splitext(f1)[1]
-                        if ext != '.bbappend':
-                            fdest = f1full[len(layer):]
-                            fdest = os.path.normpath(os.sep.join([outputdir,fdest]))
-                            bb.utils.mkdirhier(os.path.dirname(fdest))
-                            if os.path.exists(fdest):
-                                if f1 == 'layer.conf' and root.endswith('/conf'):
-                                    logger.plain('  Skipping layer config file %s' % f1full )
-                                    continue
-                                else:
-                                    logger.warn('Overwriting file %s', fdest)
-                            bb.utils.copyfile(f1full, fdest)
-                            if ext == '.bb':
-                                if f1 in self.bbhandler.cooker.collection.appendlist:
-                                    appends = self.bbhandler.cooker.collection.appendlist[f1]
-                                    if appends:
-                                        logger.plain('  Applying appends to %s' % fdest )
-                                        for appendname in appends:
-                                            if layer_path_match(appendname):
-                                                self.apply_append(appendname, fdest)
-                                    appended_recipes.append(f1)
-
-        # Take care of when some layers are excluded and yet we have included bbappends for those recipes
-        for recipename in self.bbhandler.cooker.collection.appendlist.iterkeys():
-            if recipename not in appended_recipes:
-                appends = self.bbhandler.cooker.collection.appendlist[recipename]
-                first_append = None
-                for appendname in appends:
-                    layer = layer_path_match(appendname)
-                    if layer:
-                        if first_append:
-                            self.apply_append(appendname, first_append)
-                        else:
-                            fdest = appendname[len(layer):]
-                            fdest = os.path.normpath(os.sep.join([outputdir,fdest]))
-                            bb.utils.mkdirhier(os.path.dirname(fdest))
-                            bb.utils.copyfile(appendname, fdest)
-                            first_append = fdest
-
-        # Get the regex for the first layer in our list (which is where the conf/layer.conf file will
-        # have come from)
-        first_regex = None
-        layerdir = layers[0]
-        for layername, pattern, regex, _ in self.bbhandler.cooker.recipecache.bbfile_config_priorities:
-            if regex.match(os.path.join(layerdir, 'test')):
-                first_regex = regex
-                break
-
-        if first_regex:
-            # Find the BBFILES entries that match (which will have come from this conf/layer.conf file)
-            bbfiles = str(self.bbhandler.config_data.getVar('BBFILES', True)).split()
-            bbfiles_layer = []
-            for item in bbfiles:
-                if first_regex.match(item):
-                    newpath = os.path.join(outputdir, item[len(layerdir)+1:])
-                    bbfiles_layer.append(newpath)
-
-            if bbfiles_layer:
-                # Check that all important layer files match BBFILES
-                for root, dirs, files in os.walk(outputdir):
-                    for f1 in files:
-                        ext = os.path.splitext(f1)[1]
-                        if ext in ['.bb', '.bbappend']:
-                            f1full = os.sep.join([root, f1])
-                            entry_found = False
-                            for item in bbfiles_layer:
-                                if fnmatch.fnmatch(f1full, item):
-                                    entry_found = True
-                                    break
-                            if not entry_found:
-                                logger.warning("File %s does not match the flattened layer's BBFILES setting, you may need to edit conf/layer.conf or move the file elsewhere" % f1full)
-
-    def get_file_layer(self, filename):
-        for layer, _, regex, _ in self.bbhandler.cooker.recipecache.bbfile_config_priorities:
-            if regex.match(filename):
-                for layerdir in self.bblayers:
-                    if regex.match(os.path.join(layerdir, 'test')) and re.match(layerdir, filename):
-                        return self.get_layer_name(layerdir)
-        return "?"
-
-    def get_file_layerdir(self, filename):
-        for layer, _, regex, _ in self.bbhandler.cooker.recipecache.bbfile_config_priorities:
-            if regex.match(filename):
-                for layerdir in self.bblayers:
-                    if regex.match(os.path.join(layerdir, 'test')) and re.match(layerdir, filename):
-                        return layerdir
-        return "?"
-
-    def remove_layer_prefix(self, f):
-        """Remove the layer_dir prefix, e.g., f = /path/to/layer_dir/foo/blah, the
-           return value will be: layer_dir/foo/blah"""
-        f_layerdir = self.get_file_layerdir(f)
-        prefix = os.path.join(os.path.dirname(f_layerdir), '')
-        return f[len(prefix):] if f.startswith(prefix) else f
-
-    def get_layer_name(self, layerdir):
-        return os.path.basename(layerdir.rstrip(os.sep))
-
-    def apply_append(self, appendname, recipename):
-        appendfile = open(appendname, 'r')
-        recipefile = open(recipename, 'a')
-        recipefile.write('\n')
-        recipefile.write('##### bbappended from %s #####\n' % self.get_file_layer(appendname))
-        recipefile.writelines(appendfile.readlines())
-        recipefile.close()
-        appendfile.close()
-
-    def do_show_appends(self, args):
-        """list bbappend files and recipe files they apply to
-
-usage: show-appends
-
-Recipes are listed with the bbappends that apply to them as subitems.
-"""
-        self.init_bbhandler()
-        if not self.bbhandler.cooker.collection.appendlist:
-            logger.plain('No append files found')
-            return
-
-        logger.plain('=== Appended recipes ===')
-
-        pnlist = list(self.bbhandler.cooker_data.pkg_pn.keys())
-        pnlist.sort()
-        for pn in pnlist:
-            self.show_appends_for_pn(pn)
-
-        self.show_appends_for_skipped()
-
-    def show_appends_for_pn(self, pn):
-        filenames = self.bbhandler.cooker_data.pkg_pn[pn]
-
-        best = bb.providers.findBestProvider(pn,
-                                             self.bbhandler.config_data,
-                                             self.bbhandler.cooker_data,
-                                             self.bbhandler.cooker_data.pkg_pn)
-        best_filename = os.path.basename(best[3])
-
-        self.show_appends_output(filenames, best_filename)
-
-    def show_appends_for_skipped(self):
-        filenames = [os.path.basename(f)
-                    for f in self.bbhandler.cooker.skiplist.iterkeys()]
-        self.show_appends_output(filenames, None, " (skipped)")
-
-    def show_appends_output(self, filenames, best_filename, name_suffix = ''):
-        appended, missing = self.get_appends_for_files(filenames)
-        if appended:
-            for basename, appends in appended:
-                logger.plain('%s%s:', basename, name_suffix)
-                for append in appends:
-                    logger.plain('  %s', append)
-
-            if best_filename:
-                if best_filename in missing:
-                    logger.warn('%s: missing append for preferred version',
-                                best_filename)
-                    self.returncode |= 1
-
-
-    def get_appends_for_files(self, filenames):
-        appended, notappended = [], []
-        for filename in filenames:
-            _, cls = bb.cache.Cache.virtualfn2realfn(filename)
-            if cls:
-                continue
-
-            basename = os.path.basename(filename)
-            appends = self.bbhandler.cooker.collection.appendlist.get(basename)
-            if appends:
-                appended.append((basename, list(appends)))
-            else:
-                notappended.append(basename)
-        return appended, notappended
-
-    def do_show_cross_depends(self, args):
-        """figure out the dependency between recipes that crosses a layer boundary.
-
-usage: show-cross-depends [-f]
-
-Figure out the dependency between recipes that crosses a layer boundary.
-
-Options:
-  -f   show full file path
-
-NOTE:
-The .bbappend file can impact the dependency.
-"""
-        self.init_bbhandler()
-
-        show_filenames = False
-        for arg in args.split():
-            if arg == '-f':
-                show_filenames = True
-            else:
-                sys.stderr.write("show-cross-depends: invalid option %s\n" % arg)
-                self.do_help('')
-                return
-
-        pkg_fn = self.bbhandler.cooker_data.pkg_fn
-        bbpath = str(self.bbhandler.config_data.getVar('BBPATH', True))
-        self.require_re = re.compile(r"require\s+(.+)")
-        self.include_re = re.compile(r"include\s+(.+)")
-        self.inherit_re = re.compile(r"inherit\s+(.+)")
-
-        # The bb's DEPENDS and RDEPENDS
-        for f in pkg_fn:
-            f = bb.cache.Cache.virtualfn2realfn(f)[0]
-            # Get the layername that the file is in
-            layername = self.get_file_layer(f)
-
-            # The DEPENDS
-            deps = self.bbhandler.cooker_data.deps[f]
-            for pn in deps:
-                if pn in self.bbhandler.cooker_data.pkg_pn:
-                    best = bb.providers.findBestProvider(pn,
-                            self.bbhandler.config_data,
-                            self.bbhandler.cooker_data,
-                            self.bbhandler.cooker_data.pkg_pn)
-                    self.check_cross_depends("DEPENDS", layername, f, best[3], show_filenames)
-
-            # The RDPENDS
-            all_rdeps = self.bbhandler.cooker_data.rundeps[f].values()
-            # Remove the duplicated or null one.
-            sorted_rdeps = {}
-            # The all_rdeps is the list in list, so we need two for loops
-            for k1 in all_rdeps:
-                for k2 in k1:
-                    sorted_rdeps[k2] = 1
-            all_rdeps = sorted_rdeps.keys()
-            for rdep in all_rdeps:
-                all_p = bb.providers.getRuntimeProviders(self.bbhandler.cooker_data, rdep)
-                if all_p:
-                    best = bb.providers.filterProvidersRunTime(all_p, rdep,
-                                    self.bbhandler.config_data,
-                                    self.bbhandler.cooker_data)[0][0]
-                    self.check_cross_depends("RDEPENDS", layername, f, best, show_filenames)
-
-            # The inherit class
-            cls_re = re.compile('classes/')
-            if f in self.bbhandler.cooker_data.inherits:
-                inherits = self.bbhandler.cooker_data.inherits[f]
-                for cls in inherits:
-                    # The inherits' format is [classes/cls, /path/to/classes/cls]
-                    # ignore the classes/cls.
-                    if not cls_re.match(cls):
-                        inherit_layername = self.get_file_layer(cls)
-                        if inherit_layername != layername:
-                            if not show_filenames:
-                                f_short = self.remove_layer_prefix(f)
-                                cls = self.remove_layer_prefix(cls)
-                            else:
-                                f_short = f
-                            logger.plain("%s inherits %s" % (f_short, cls))
-
-            # The 'require/include xxx' in the bb file
-            pv_re = re.compile(r"\${PV}")
-            fnfile = open(f, 'r')
-            line = fnfile.readline()
-            while line:
-                m, keyword = self.match_require_include(line)
-                # Found the 'require/include xxxx'
-                if m:
-                    needed_file = m.group(1)
-                    # Replace the ${PV} with the real PV
-                    if pv_re.search(needed_file) and f in self.bbhandler.cooker_data.pkg_pepvpr:
-                        pv = self.bbhandler.cooker_data.pkg_pepvpr[f][1]
-                        needed_file = re.sub(r"\${PV}", pv, needed_file)
-                    self.print_cross_files(bbpath, keyword, layername, f, needed_file, show_filenames)
-                line = fnfile.readline()
-            fnfile.close()
-
-        # The "require/include xxx" in conf/machine/*.conf, .inc and .bbclass
-        conf_re = re.compile(".*/conf/machine/[^\/]*\.conf$")
-        inc_re = re.compile(".*\.inc$")
-        # The "inherit xxx" in .bbclass
-        bbclass_re = re.compile(".*\.bbclass$")
-        for layerdir in self.bblayers:
-            layername = self.get_layer_name(layerdir)
-            for dirpath, dirnames, filenames in os.walk(layerdir):
-                for name in filenames:
-                    f = os.path.join(dirpath, name)
-                    s = conf_re.match(f) or inc_re.match(f) or bbclass_re.match(f)
-                    if s:
-                        ffile = open(f, 'r')
-                        line = ffile.readline()
-                        while line:
-                            m, keyword = self.match_require_include(line)
-                            # Only bbclass has the "inherit xxx" here.
-                            bbclass=""
-                            if not m and f.endswith(".bbclass"):
-                                m, keyword = self.match_inherit(line)
-                                bbclass=".bbclass"
-                            # Find a 'require/include xxxx'
-                            if m:
-                                self.print_cross_files(bbpath, keyword, layername, f, m.group(1) + bbclass, show_filenames)
-                            line = ffile.readline()
-                        ffile.close()
-
-    def print_cross_files(self, bbpath, keyword, layername, f, needed_filename, show_filenames):
-        """Print the depends that crosses a layer boundary"""
-        needed_file = bb.utils.which(bbpath, needed_filename)
-        if needed_file:
-            # Which layer is this file from
-            needed_layername = self.get_file_layer(needed_file)
-            if needed_layername != layername:
-                if not show_filenames:
-                    f = self.remove_layer_prefix(f)
-                    needed_file = self.remove_layer_prefix(needed_file)
-                logger.plain("%s %s %s" %(f, keyword, needed_file))
-    def match_inherit(self, line):
-        """Match the inherit xxx line"""
-        return (self.inherit_re.match(line), "inherits")
-
-    def match_require_include(self, line):
-        """Match the require/include xxx line"""
-        m = self.require_re.match(line)
-        keyword = "requires"
-        if not m:
-            m = self.include_re.match(line)
-            keyword = "includes"
-        return (m, keyword)
-
-    def check_cross_depends(self, keyword, layername, f, needed_file, show_filenames):
-        """Print the DEPENDS/RDEPENDS file that crosses a layer boundary"""
-        best_realfn = bb.cache.Cache.virtualfn2realfn(needed_file)[0]
-        needed_layername = self.get_file_layer(best_realfn)
-        if needed_layername != layername:
-            if not show_filenames:
-                f = self.remove_layer_prefix(f)
-                best_realfn = self.remove_layer_prefix(best_realfn)
-
-            logger.plain("%s %s %s" % (f, keyword, best_realfn))
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv[1:]) or 0)

bitbake/bin/bitbake-prserv

@@ -1,55 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys,logging
-import optparse
-
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(__file__)),'lib'))
-
-import prserv
-import prserv.serv
-
-__version__="1.0.0"
-
-PRHOST_DEFAULT='0.0.0.0'
-PRPORT_DEFAULT=8585
-
-def main():
-    parser = optparse.OptionParser(
-        version="Bitbake PR Service Core version %s, %%prog version %s" % (prserv.__version__, __version__),
-        usage = "%prog < --start | --stop > [options]")
-
-    parser.add_option("-f", "--file", help="database filename(default: prserv.sqlite3)", action="store",
-                      dest="dbfile", type="string", default="prserv.sqlite3")
-    parser.add_option("-l", "--log", help="log filename(default: prserv.log)", action="store",
-                      dest="logfile", type="string", default="prserv.log")
-    parser.add_option("--loglevel", help="logging level, i.e. CRITICAL, ERROR, WARNING, INFO, DEBUG",
-                      action = "store", type="string", dest="loglevel", default = "INFO")
-    parser.add_option("--start", help="start daemon",
-                      action="store_true", dest="start")
-    parser.add_option("--stop", help="stop daemon",
-                      action="store_true", dest="stop")
-    parser.add_option("--host", help="ip address to bind", action="store",
-                      dest="host", type="string", default=PRHOST_DEFAULT)
-    parser.add_option("--port", help="port number(default: 8585)", action="store",
-                      dest="port", type="int", default=PRPORT_DEFAULT)
-
-    options, args = parser.parse_args(sys.argv)
-    prserv.init_logger(os.path.abspath(options.logfile),options.loglevel)
-
-    if options.start:
-        ret=prserv.serv.start_daemon(options.dbfile, options.host, options.port,os.path.abspath(options.logfile))
-    elif options.stop:
-        ret=prserv.serv.stop_daemon(options.host, options.port)
-    else:
-        ret=parser.print_help()
-    return ret
-
-if __name__ == "__main__":
-    try:
-        ret = main()
-    except Exception:
-        ret = 1
-        import traceback
-        traceback.print_exc(5)
-    sys.exit(ret)
-

bitbake/bin/bitbake-selftest

@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (C) 2012 Richard Purdie
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import os
-import sys, logging
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(__file__)), 'lib'))
-
-import unittest
-try:
-    import bb
-except RuntimeError as exc:
-    sys.exit(str(exc))
-
-tests = ["bb.tests.codeparser", 
-         "bb.tests.cow",
-         "bb.tests.data",
-         "bb.tests.fetch",
-         "bb.tests.utils"]
-
-for t in tests:
-    __import__(t)
-
-unittest.main(argv=["bitbake-selftest"] + tests)
-

bitbake/bin/bitbake-worker

@@ -1,365 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import sys
-import warnings
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib'))
-from bb import fetch2
-import logging
-import bb
-import select
-import errno
-import signal
-
-# Users shouldn't be running this code directly
-if len(sys.argv) != 2 or sys.argv[1] != "decafbad":
-    print("bitbake-worker is meant for internal execution by bitbake itself, please don't use it standalone.")
-    sys.exit(1)
-
-logger = logging.getLogger("BitBake")
-
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
-    bb.msg.note(1, bb.msg.domain.Cache, "Importing cPickle failed. Falling back to a very slow implementation.")
-
-
-worker_pipe = sys.stdout.fileno()
-bb.utils.nonblockingfd(worker_pipe)
-
-handler = bb.event.LogHandler()
-logger.addHandler(handler)
-
-if 0:
-    # Code to write out a log file of all events passing through the worker
-    logfilename = "/tmp/workerlogfile"
-    format_str = "%(levelname)s: %(message)s"
-    conlogformat = bb.msg.BBLogFormatter(format_str)
-    consolelog = logging.FileHandler(logfilename)
-    bb.msg.addDefaultlogFilter(consolelog)
-    consolelog.setFormatter(conlogformat)
-    logger.addHandler(consolelog)
-
-worker_queue = ""
-
-def worker_fire(event, d):
-    data = "<event>" + pickle.dumps(event) + "</event>"
-    worker_fire_prepickled(data)
-
-def worker_fire_prepickled(event):
-    global worker_queue
-
-    worker_queue = worker_queue + event
-    worker_flush()
-
-def worker_flush():
-    global worker_queue, worker_pipe
-
-    if not worker_queue:
-        return
-
-    try:
-        written = os.write(worker_pipe, worker_queue)
-        worker_queue = worker_queue[written:]
-    except (IOError, OSError) as e:
-        if e.errno != errno.EAGAIN:
-            raise
-
-def worker_child_fire(event, d):
-    global worker_pipe
-
-    data = "<event>" + pickle.dumps(event) + "</event>"
-    worker_pipe.write(data)
-
-bb.event.worker_fire = worker_fire
-
-lf = None
-#lf = open("/tmp/workercommandlog", "w+")
-def workerlog_write(msg):
-    if lf:
-        lf.write(msg)
-        lf.flush()
-
-def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, taskdepdata, quieterrors=False):
-    # We need to setup the environment BEFORE the fork, since
-    # a fork() or exec*() activates PSEUDO...
-
-    envbackup = {}
-    fakeenv = {}
-    umask = None
-
-    taskdep = workerdata["taskdeps"][fn]
-    if 'umask' in taskdep and taskname in taskdep['umask']:
-        # umask might come in as a number or text string..
-        try:
-             umask = int(taskdep['umask'][taskname],8)
-        except TypeError:
-             umask = taskdep['umask'][taskname]
-
-    # We can't use the fakeroot environment in a dry run as it possibly hasn't been built
-    if 'fakeroot' in taskdep and taskname in taskdep['fakeroot'] and not cfg.dry_run:
-        envvars = (workerdata["fakerootenv"][fn] or "").split()
-        for key, value in (var.split('=') for var in envvars):
-            envbackup[key] = os.environ.get(key)
-            os.environ[key] = value
-            fakeenv[key] = value
-
-        fakedirs = (workerdata["fakerootdirs"][fn] or "").split()
-        for p in fakedirs:
-            bb.utils.mkdirhier(p)
-        logger.debug(2, 'Running %s:%s under fakeroot, fakedirs: %s' %
-                        (fn, taskname, ', '.join(fakedirs)))
-    else:
-        envvars = (workerdata["fakerootnoenv"][fn] or "").split()
-        for key, value in (var.split('=') for var in envvars):
-            envbackup[key] = os.environ.get(key)
-            os.environ[key] = value
-            fakeenv[key] = value
-
-    sys.stdout.flush()
-    sys.stderr.flush()
-
-    try:
-        pipein, pipeout = os.pipe()
-        pipein = os.fdopen(pipein, 'rb', 4096)
-        pipeout = os.fdopen(pipeout, 'wb', 0)
-        pid = os.fork()
-    except OSError as e:
-        bb.msg.fatal("RunQueue", "fork failed: %d (%s)" % (e.errno, e.strerror))
-
-    if pid == 0:
-            global worker_pipe
-            pipein.close()
-
-            # Save out the PID so that the event can include it the
-            # events
-            bb.event.worker_pid = os.getpid()
-            bb.event.worker_fire = worker_child_fire
-            worker_pipe = pipeout
-
-            # Make the child the process group leader
-            os.setpgid(0, 0)
-            # No stdin
-            newsi = os.open(os.devnull, os.O_RDWR)
-            os.dup2(newsi, sys.stdin.fileno())
-
-            if umask:
-                os.umask(umask)
-
-            data.setVar("BB_WORKERCONTEXT", "1")
-            data.setVar("BB_TASKDEPDATA", taskdepdata)
-            data.setVar("BUILDNAME", workerdata["buildname"])
-            data.setVar("DATE", workerdata["date"])
-            data.setVar("TIME", workerdata["time"])
-            bb.parse.siggen.set_taskdata(workerdata["hashes"], workerdata["hash_deps"], workerdata["sigchecksums"])
-            ret = 0
-            try:
-                the_data = bb.cache.Cache.loadDataFull(fn, appends, data)
-                the_data.setVar('BB_TASKHASH', workerdata["runq_hash"][task])
-                for h in workerdata["hashes"]:
-                    the_data.setVar("BBHASH_%s" % h, workerdata["hashes"][h])
-                for h in workerdata["hash_deps"]:
-                    the_data.setVar("BBHASHDEPS_%s" % h, workerdata["hash_deps"][h])
-
-                # exported_vars() returns a generator which *cannot* be passed to os.environ.update() 
-                # successfully. We also need to unset anything from the environment which shouldn't be there 
-                exports = bb.data.exported_vars(the_data)
-                bb.utils.empty_environment()
-                for e, v in exports:
-                    os.environ[e] = v
-                for e in fakeenv:
-                    os.environ[e] = fakeenv[e]
-                    the_data.setVar(e, fakeenv[e])
-                    the_data.setVarFlag(e, 'export', "1")
-
-                if quieterrors:
-                    the_data.setVarFlag(taskname, "quieterrors", "1")
-
-            except Exception as exc:
-                if not quieterrors:
-                    logger.critical(str(exc))
-                os._exit(1)
-            try:
-                if not cfg.dry_run:
-                    ret = bb.build.exec_task(fn, taskname, the_data, cfg.profile)
-                os._exit(ret)
-            except:
-                os._exit(1)
-    else:
-        for key, value in envbackup.iteritems():
-            if value is None:
-                del os.environ[key]
-            else:
-                os.environ[key] = value
-
-    return pid, pipein, pipeout
-
-class runQueueWorkerPipe():
-    """
-    Abstraction for a pipe between a worker thread and the worker server
-    """
-    def __init__(self, pipein, pipeout):
-        self.input = pipein
-        if pipeout:
-            pipeout.close()
-        bb.utils.nonblockingfd(self.input)
-        self.queue = ""
-
-    def read(self):
-        start = len(self.queue)
-        try:
-            self.queue = self.queue + self.input.read(102400)
-        except (OSError, IOError) as e:
-            if e.errno != errno.EAGAIN:
-                raise
-
-        end = len(self.queue)
-        index = self.queue.find("</event>")
-        while index != -1:
-            worker_fire_prepickled(self.queue[:index+8])
-            self.queue = self.queue[index+8:]
-            index = self.queue.find("</event>")
-        return (end > start)
-
-    def close(self):
-        while self.read():
-            continue
-        if len(self.queue) > 0:
-            print("Warning, worker child left partial message: %s" % self.queue)
-        self.input.close()
-
-normalexit = False
-
-class BitbakeWorker(object):
-    def __init__(self, din):
-        self.input = din
-        bb.utils.nonblockingfd(self.input)
-        self.queue = ""
-        self.cookercfg = None
-        self.databuilder = None
-        self.data = None
-        self.build_pids = {}
-        self.build_pipes = {}
-    
-    def serve(self):        
-        while True:
-            (ready, _, _) = select.select([self.input] + [i.input for i in self.build_pipes.values()], [] , [], 1)
-            if self.input in ready or len(self.queue):
-                start = len(self.queue)
-                try:
-                    self.queue = self.queue + self.input.read()
-                except (OSError, IOError):
-                    pass
-                end = len(self.queue)
-                self.handle_item("cookerconfig", self.handle_cookercfg)
-                self.handle_item("workerdata", self.handle_workerdata)
-                self.handle_item("runtask", self.handle_runtask)
-                self.handle_item("finishnow", self.handle_finishnow)
-                self.handle_item("ping", self.handle_ping)
-                self.handle_item("quit", self.handle_quit)
-
-            for pipe in self.build_pipes:
-                self.build_pipes[pipe].read()
-            if len(self.build_pids):
-                self.process_waitpid()
-            worker_flush()
-
-
-    def handle_item(self, item, func):
-        if self.queue.startswith("<" + item + ">"):
-            index = self.queue.find("</" + item + ">")
-            while index != -1:
-                func(self.queue[(len(item) + 2):index])
-                self.queue = self.queue[(index + len(item) + 3):]
-                index = self.queue.find("</" + item + ">")
-
-    def handle_cookercfg(self, data):
-        self.cookercfg = pickle.loads(data)
-        self.databuilder = bb.cookerdata.CookerDataBuilder(self.cookercfg, worker=True)
-        self.databuilder.parseBaseConfiguration()
-        self.data = self.databuilder.data
-
-    def handle_workerdata(self, data):
-        self.workerdata = pickle.loads(data)
-        bb.msg.loggerDefaultDebugLevel = self.workerdata["logdefaultdebug"]
-        bb.msg.loggerDefaultVerbose = self.workerdata["logdefaultverbose"]
-        bb.msg.loggerVerboseLogs = self.workerdata["logdefaultverboselogs"]
-        bb.msg.loggerDefaultDomains = self.workerdata["logdefaultdomain"]
-        self.data.setVar("PRSERV_HOST", self.workerdata["prhost"])
-
-    def handle_ping(self, _):
-        workerlog_write("Handling ping\n")
-
-        logger.warn("Pong from bitbake-worker!")
-
-    def handle_quit(self, data):
-        workerlog_write("Handling quit\n")
-
-        global normalexit
-        normalexit = True
-        sys.exit(0)
-
-    def handle_runtask(self, data):
-        fn, task, taskname, quieterrors, appends, taskdepdata = pickle.loads(data)
-        workerlog_write("Handling runtask %s %s %s\n" % (task, fn, taskname))
-
-        pid, pipein, pipeout = fork_off_task(self.cookercfg, self.data, self.workerdata, fn, task, taskname, appends, taskdepdata, quieterrors)
-
-        self.build_pids[pid] = task
-        self.build_pipes[pid] = runQueueWorkerPipe(pipein, pipeout)
-
-    def process_waitpid(self):
-        """
-        Return none is there are no processes awaiting result collection, otherwise
-        collect the process exit codes and close the information pipe.
-        """
-        try:
-            pid, status = os.waitpid(-1, os.WNOHANG)
-            if pid == 0 or os.WIFSTOPPED(status):
-                return None
-        except OSError:
-            return None
-
-        workerlog_write("Exit code of %s for pid %s\n" % (status, pid))
-
-        if os.WIFEXITED(status):
-            status = os.WEXITSTATUS(status)
-        elif os.WIFSIGNALED(status):
-            # Per shell conventions for $?, when a process exits due to
-            # a signal, we return an exit code of 128 + SIGNUM
-            status = 128 + os.WTERMSIG(status)
-
-        task = self.build_pids[pid]
-        del self.build_pids[pid]
-
-        self.build_pipes[pid].close()
-        del self.build_pipes[pid]
-
-        worker_fire_prepickled("<exitcode>" + pickle.dumps((task, status)) + "</exitcode>")
-
-    def handle_finishnow(self, _):
-        if self.build_pids:
-            logger.info("Sending SIGTERM to remaining %s tasks", len(self.build_pids))
-            for k, v in self.build_pids.iteritems():
-                try:
-                    os.kill(-k, signal.SIGTERM)
-                    os.waitpid(-1, 0)
-                except:
-                    pass
-        for pipe in self.build_pipes:
-            self.build_pipes[pipe].read()
-
-try:
-    worker = BitbakeWorker(sys.stdin)
-    worker.serve()
-except BaseException as e:
-    if not normalexit:
-        import traceback
-        sys.stderr.write(traceback.format_exc())
-        sys.stderr.write(str(e))
-while len(worker_queue):
-    worker_flush()
-workerlog_write("exitting")
-sys.exit(0)
-

bitbake/bin/bitdoc

@@ -20,7 +20,7 @@
 import optparse, os, sys
 
 # bitbake
-sys.path.append(os.path.join(os.path.dirname(os.path.dirname(__file__), 'lib'))
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib'))
 import bb
 import bb.parse
 from   string import split, join
@@ -48,7 +48,7 @@ class HTMLFormatter:
         From pydoc... almost identical at least
         """
         while pairs:
-            (a, b) = pairs[0]
+            (a,b) = pairs[0]
             text = join(split(text, a), b)
             pairs = pairs[1:]
         return text
@@ -87,7 +87,7 @@ class HTMLFormatter:
 
         return txt + ",".join(txts)
 
-    def groups(self, item):
+    def groups(self,item):
         """
         Create HTML to link to related groups
         """
@@ -99,12 +99,12 @@ class HTMLFormatter:
         txt = "<p><b>See also:</b><br>"
         txts = []
         for group in item.groups():
-            txts.append( """<a href="group%s.html">%s</a> """ % (group, group) )
+            txts.append( """<a href="group%s.html">%s</a> """ % (group,group) )
 
         return txt + ",".join(txts)
 
 
-    def createKeySite(self, item):
+    def createKeySite(self,item):
         """
         Create a site for a key. It contains the header/navigator, a heading,
         the description, links to related keys and to the groups.
@@ -149,7 +149,8 @@ class HTMLFormatter:
         """
 
         groups = ""
-        sorted_groups = sorted(doc.groups())
+        sorted_groups = doc.groups()
+        sorted_groups.sort()
         for group in sorted_groups:
             groups += """<a href="group%s.html">%s</a><br>""" % (group, group)
 
@@ -184,7 +185,8 @@ class HTMLFormatter:
         Create Overview of all avilable keys
         """
         keys = ""
-        sorted_keys = sorted(doc.doc_keys())
+        sorted_keys = doc.doc_keys()
+        sorted_keys.sort()
         for key in sorted_keys:
             keys += """<a href="key%s.html">%s</a><br>""" % (key, key)
 
@@ -212,7 +214,7 @@ class HTMLFormatter:
             description  += "<h2 Description of Grozp %s</h2>" % gr
             description  += _description
 
-        items.sort(lambda x, y:cmp(x.name(), y.name()))
+        items.sort(lambda x,y:cmp(x.name(),y.name()))
         for group in items:
             groups += """<a href="key%s.html">%s</a><br>""" % (group.name(), group.name())
 
@@ -341,7 +343,7 @@ class DocumentationItem:
     def addGroup(self, group):
         self._groups.append(group)
 
-    def addRelation(self, relation):
+    def addRelation(self,relation):
         self._related.append(relation)
 
     def sort(self):
@@ -394,7 +396,7 @@ class Documentation:
         """
         return self.__groups.keys()
 
-    def group_content(self, group_name):
+    def group_content(self,group_name):
         """
         Return a list of keys/names that are in a specefic
         group or the empty list
@@ -410,7 +412,7 @@ def parse_cmdline(args):
     Parse the CMD line and return the result as a n-tuple
     """
 
-    parser = optparse.OptionParser( version = "Bitbake Documentation Tool Core version %s, %%prog version %s" % (bb.__version__, __version__))
+    parser = optparse.OptionParser( version = "Bitbake Documentation Tool Core version %s, %%prog version %s" % (bb.__version__,__version__))
     usage  = """%prog [options]
 
 Create a set of html pages (documentation) for a bitbake.conf....
@@ -426,12 +428,13 @@ Create a set of html pages (documentation) for a bitbake.conf....
     parser.add_option( "-D",  "--debug", help = "Increase the debug level",
                        action = "count", dest = "debug", default = 0 )
 
-    parser.add_option( "-v", "--verbose", help = "output more chit-char to the terminal",
+    parser.add_option( "-v","--verbose", help = "output more chit-char to the terminal",
                        action = "store_true", dest = "verbose", default = False )
 
     options, args = parser.parse_args( sys.argv )
- 
-    bb.msg.init_msgconfig(options.verbose, options.debug)
+
+    if options.debug:
+        bb.msg.set_debug_level(options.debug)
 
     return options.config, options.output
 
@@ -440,7 +443,7 @@ def main():
     The main Method
     """
 
-    (config_file, output_dir) = parse_cmdline( sys.argv )
+    (config_file,output_dir) = parse_cmdline( sys.argv )
 
     # right to let us load the file now
     try:
@@ -450,8 +453,6 @@ def main():
     except bb.parse.ParseError:
         bb.fatal( "Unable to parse %s" % config_file )
 
-    if isinstance(documentation, dict):
-        documentation = documentation[""]
 
     # Assuming we've the file loaded now, we will initialize the 'tree'
     doc = Documentation()
@@ -462,7 +463,7 @@ def main():
     state_group = 2
 
     for key in bb.data.keys(documentation):
-        data   = documentation.getVarFlag(key, "doc")
+        data   = bb.data.getVarFlag(key, "doc", documentation)
         if not data:
             continue
 
@@ -496,7 +497,7 @@ def main():
         doc.insert_doc_item(doc_ins)
 
     # let us create the HTML now
-    bb.utils.mkdirhier(output_dir)
+    bb.mkdirhier(output_dir)
     os.chdir(output_dir)
 
     # Let us create the sites now. We do it in the following order

bitbake/bin/image-writer

@@ -1,122 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2012 Wind River Systems, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-import os
-import sys
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname( \
-                                    os.path.abspath(__file__))), 'lib'))
-try:
-    import bb
-except RuntimeError as exc:
-    sys.exit(str(exc))
-
-import gtk
-import optparse
-import pygtk
-
-from bb.ui.crumbs.hobwidget import HobAltButton, HobButton
-from bb.ui.crumbs.hig.crumbsmessagedialog import CrumbsMessageDialog
-from bb.ui.crumbs.hig.deployimagedialog import DeployImageDialog
-from bb.ui.crumbs.hig.imageselectiondialog import ImageSelectionDialog
-
-# I put all the fs bitbake supported here. Need more test.
-DEPLOYABLE_IMAGE_TYPES = ["jffs2", "cramfs", "ext2", "ext3", "btrfs", "squashfs", "ubi", "vmdk"]
-Title = "USB Image Writer"
-
-class DeployWindow(gtk.Window):
-    def __init__(self, image_path=''):
-        super(DeployWindow, self).__init__()
-
-        if len(image_path) > 0:
-            valid = True
-            if not os.path.exists(image_path):
-                valid = False
-                lbl = "<b>Invalid image file path: %s.</b>\nPress <b>Select Image</b> to select an image." % image_path
-            else:
-                image_path = os.path.abspath(image_path)
-                extend_name = os.path.splitext(image_path)[1][1:]
-                if extend_name not in DEPLOYABLE_IMAGE_TYPES:
-                    valid = False
-                    lbl = "<b>Undeployable imge type: %s</b>\nPress <b>Select Image</b> to select an image." % extend_name
-
-            if not valid:
-                image_path = ''
-                crumbs_dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_INFO)
-                button = crumbs_dialog.add_button("Close", gtk.RESPONSE_OK)
-                HobButton.style_button(button)
-                crumbs_dialog.run()
-                crumbs_dialog.destroy()
-
-        self.deploy_dialog = DeployImageDialog(Title, image_path, self,
-                                        gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT
-                                        | gtk.DIALOG_NO_SEPARATOR, None, standalone=True)
-        close_button = self.deploy_dialog.add_button("Close", gtk.RESPONSE_NO)
-        HobAltButton.style_button(close_button)
-        close_button.connect('clicked', gtk.main_quit)
-
-        write_button = self.deploy_dialog.add_button("Write USB image", gtk.RESPONSE_YES)
-        HobAltButton.style_button(write_button)
-
-        self.deploy_dialog.connect('select_image_clicked', self.select_image_clicked_cb)
-        self.deploy_dialog.connect('destroy', gtk.main_quit)
-        response = self.deploy_dialog.show()
-
-    def select_image_clicked_cb(self, dialog):
-        cwd = os.getcwd()
-        dialog = ImageSelectionDialog(cwd, DEPLOYABLE_IMAGE_TYPES, Title, self, gtk.FILE_CHOOSER_ACTION_SAVE )
-        button = dialog.add_button("Cancel", gtk.RESPONSE_NO)
-        HobAltButton.style_button(button)
-        button = dialog.add_button("Open", gtk.RESPONSE_YES)
-        HobAltButton.style_button(button)
-        response = dialog.run()
-
-        if response == gtk.RESPONSE_YES:
-            if not dialog.image_names:
-                lbl = "<b>No selections made</b>\nClicked the radio button to select a image."
-                crumbs_dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_INFO)
-                button = crumbs_dialog.add_button("Close", gtk.RESPONSE_OK)
-                HobButton.style_button(button)
-                crumbs_dialog.run()
-                crumbs_dialog.destroy()
-                dialog.destroy()
-                return
-
-            # get the full path of image
-            image_path = os.path.join(dialog.image_folder, dialog.image_names[0])
-            self.deploy_dialog.set_image_text_buffer(image_path)
-            self.deploy_dialog.set_image_path(image_path)
-
-        dialog.destroy()
-
-def main():
-    parser = optparse.OptionParser(
-                usage = """%prog [-h] [image_file]
-
-%prog writes bootable images to USB devices. You can
-provide the image file on the command line or select it using the GUI.""")
-
-    options, args = parser.parse_args(sys.argv)
-    image_file = args[1] if len(args) > 1 else ''
-    dw = DeployWindow(image_file)
-
-if __name__ == '__main__':
-    try:
-        main()
-        gtk.main()
-    except Exception:
-        import traceback
-        traceback.print_exc(3)

bitbake/bin/toaster

@@ -1,203 +0,0 @@
-#!/bin/bash
-# (c) 2013 Intel Corp.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-# This script enables toaster event logging and
-# starts bitbake resident server
-# use as:  source toaster [start|stop]
-
-# Helper function to kill a background toaster development server
-
-function webserverKillAll()
-{
-	local pidfile
-	for pidfile in ${BUILDDIR}/.toastermain.pid; do
-		if [ -f ${pidfile} ]; then
-		while kill -0 $(< ${pidfile}) 2>/dev/null; do
-			kill -SIGTERM -$(< ${pidfile}) 2>/dev/null
-			sleep 1;
-		done;
-		rm  ${pidfile}
-		fi
-	done
-}
-
-function webserverStartAll()
-{
-        retval=0
-        python $BBBASEDIR/lib/toaster/manage.py syncdb || retval=1
-        python $BBBASEDIR/lib/toaster/manage.py migrate orm || retval=2
-        if [ $retval -eq 1 ]; then
-                echo "Failed db sync, stopping system start" 1>&2
-        elif [ $retval -eq 2 ]; then
-            echo -e "\nError on migration, trying to recover... \n"
-            python $BBBASEDIR/lib/toaster/manage.py migrate orm 0001_initial --fake
-            retval=0
-            python $BBBASEDIR/lib/toaster/manage.py migrate orm || retval=1
-        fi
-        if [ $retval -eq 0 ]; then
-            python $BBBASEDIR/lib/toaster/manage.py runserver 0.0.0.0:8000 </dev/null >${BUILDDIR}/toaster_web.log 2>&1 & echo $! >${BUILDDIR}/.toastermain.pid
-            sleep 1
-            if ! cat "${BUILDDIR}/.toastermain.pid" | xargs -I{} kill -0 {} ; then
-                retval=1
-                rm "${BUILDDIR}/.toastermain.pid"
-            fi
-        fi
-        return $retval
-}
-
-# Helper functions to add a special configuration file
-
-function addtoConfiguration()
-{
-        echo "#Created by toaster start script" > ${BUILDDIR}/conf/$2
-        echo $1 >> ${BUILDDIR}/conf/$2
-}
-
-# define the stop command
-function stop_system()
-{
-    if [ -f ${BUILDDIR}/.toasterui.pid ]; then
-        kill $(< ${BUILDDIR}/.toasterui.pid )
-        rm ${BUILDDIR}/.toasterui.pid
-    fi
-    BBSERVER=localhost:8200 bitbake -m
-    unset BBSERVER
-    webserverKillAll
-    # force stop any misbehaving bitbake server
-    lsof bitbake.lock | awk '{print $2}' | grep "[0-9]\+" | xargs -n1 -r kill
-}
-
-# We make sure we're running in the current shell and in a good environment
-
-if [ -z "$ZSH_NAME" ] && [ `basename \"$0\"` = `basename \"$BASH_SOURCE\"` ]; then
-    echo "Error: This script needs to be sourced. Please run as 'source toaster [start|stop]'" 1>&2;
-    exit 1
-fi
-
-if [ -z "$BUILDDIR" ] || [ -z `which bitbake` ]; then
-    echo "Error: Build environment is not setup or bitbake is not in path." 1>&2;
-    return 2
-fi
-
-BBBASEDIR=`dirname ${BASH_SOURCE}`/..
-
-
-# Verify prerequisites
-
-if ! echo "import django; print (1,5) == django.VERSION[0:2]" | python 2>/dev/null | grep True >/dev/null; then
-    echo -e "This program needs Django 1.5. Please install with\n\nsudo pip install django==1.5"
-    return 2
-fi
-
-if ! echo "import south; print [0,8,4] ==  map(int,south.__version__.split(\".\"))" | python 2>/dev/null | grep True >/dev/null; then
-    echo -e "This program needs South 0.8.4. Please install with\n\nsudo pip install south==0.8.4"
-    return 2
-fi
-
-
-
-
-
-# Determine the action. If specified by arguments, fine, if not, toggle it
-if [ "x$1" == "xstart" ] || [ "x$1" == "xstop" ]; then
-    CMD="$1"
-else
-    if [ -z "$BBSERVER" ]; then
-        CMD="start"
-    else
-        CMD="stop"
-    fi;
-fi
-
-NOTOASTERUI=0
-for param in $*; do
-    case $param in
-    noui )
-            NOTOASTERUI=1
-    ;;
-    esac
-done
-
-echo "The system will $CMD."
-
-# Make sure it's safe to run by checking bitbake lock
-
-lock=1
-if [ -e $BUILDDIR/bitbake.lock ]; then
-    (flock -n 200 ) 200<$BUILDDIR/bitbake.lock || lock=0
-fi
-
-if [ ${CMD} == "start" ] && ( [ $lock -eq 0 ] || [ -e $BUILDDIR/.toastermain.pid ] ); then
-    echo "Error: bitbake lock state error. System is already on." 2>&1
-    return 3
-elif [ ${CMD} == "stop" ] && ( [ $lock -eq 1 ] || ! [ -e $BUILDDIR/.toastermain.pid ] ) ; then
-    echo "Error: bitbake lock state error. Trying to stop a stopped system ?
-If you think the system is hanged up, you can try to manually stop system with the commands
-
-# BBSERVER=localhost:8200 bitbake -m
-
-and
-
-# webserverKillAll
-" 2>&1
-    return 3
-fi
-
-
-
-
-
-# Execute the commands
-
-case $CMD in
-    start )
-        start_success=1
-        addtoConfiguration "INHERIT+=\"toaster buildhistory\"" toaster.conf
-        if ! webserverStartAll; then
-            echo "Failed ${CMD}."
-            return 4
-        fi
-        unset BBSERVER
-        bitbake --postread conf/toaster.conf --server-only -t xmlrpc -B localhost:8200
-        if [ $? -ne 0 ]; then
-            start_success=0
-            echo "Bitbake server start failed"
-        else
-            export BBSERVER=localhost:8200
-            if [ $NOTOASTERUI == 0 ]; then        # we start the TOASTERUI only if not inhibited
-                bitbake --observe-only -u toasterui >${BUILDDIR}/toaster_ui.log 2>&1 & echo $! >${BUILDDIR}/.toasterui.pid
-            fi
-        fi
-        if [ $start_success -eq 1 ]; then
-            # set fail safe stop system on terminal exit
-            trap stop_system SIGHUP
-            echo "Successful ${CMD}."
-        else
-            # failed start, do stop
-            stop_system
-            echo "Failed ${CMD}."
-        fi
-    ;;
-    stop )
-        stop_system
-        trap '' SIGHUP
-        echo "Successful ${CMD}."
-    ;;
-esac
-
-

bitbake/contrib/dump_cache.py

@@ -1,68 +0,0 @@
-#!/usr/bin/env python
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-#
-# Copyright (C) 2012 Wind River Systems, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#
-# This is used for dumping the bb_cache.dat, the output format is:
-# recipe_path PN PV PACKAGES
-#
-import os
-import sys
-import warnings
-
-# For importing bb.cache
-sys.path.insert(0, os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), '../lib'))
-from bb.cache import CoreRecipeInfo
-
-import cPickle as pickle
-
-def main(argv=None):
-    """
-    Get the mapping for the target recipe.
-    """
-    if len(argv) != 1:
-        print >>sys.stderr, "Error, need one argument!"
-        return 2
-
-    cachefile = argv[0]
-
-    with open(cachefile, "rb") as cachefile:
-        pickled = pickle.Unpickler(cachefile)
-        while cachefile:
-            try:
-                key = pickled.load()
-                val = pickled.load()
-            except Exception:
-                break
-            if isinstance(val, CoreRecipeInfo) and (not val.skipped):
-                pn = val.pn
-                # Filter out the native recipes.
-                if key.startswith('virtual:native:') or pn.endswith("-native"):
-                    continue
-
-                # 1.0 is the default version for a no PV recipe.
-                if val.__dict__.has_key("pv"):
-                    pv = val.pv
-                else:
-                    pv = "1.0"
-
-                print("%s %s %s %s" % (key, pn, pv, ' '.join(val.packages)))
-
-if __name__ == "__main__":
-    sys.exit(main(sys.argv[1:]))
-

bitbake/contrib/vim/ftdetect/bitbake.vim

@@ -1,24 +1,4 @@
-" Vim filetype detection file
-" Language:     BitBake
-" Author:       Ricardo Salveti <rsalveti@rsalveti.net>
-" Copyright:    Copyright (C) 2008  Ricardo Salveti <rsalveti@rsalveti.net>
-" Licence:      You may redistribute this under the same terms as Vim itself
-"
-" This sets up the syntax highlighting for BitBake files, like .bb, .bbclass and .inc
-
-if &compatible || version < 600
-    finish
-endif
-
-" .bb, .bbappend and .bbclass
-au BufNewFile,BufRead *.{bb,bbappend,bbclass}	set filetype=bitbake
-
-" .inc
-au BufNewFile,BufRead *.inc		set filetype=bitbake
-
-" .conf
-au BufNewFile,BufRead *.conf
-    \ if (match(expand("%:p:h"), "conf") > 0) |
-    \     set filetype=bitbake |
-    \ endif
-
+au BufNewFile,BufRead *.bb       setfiletype bitbake
+au BufNewFile,BufRead *.bbclass  setfiletype bitbake
+au BufNewFile,BufRead *.inc      setfiletype bitbake
+" au BufNewFile,BufRead *.conf     setfiletype bitbake

bitbake/contrib/vim/ftplugin/bitbake.vim

@@ -1,2 +0,0 @@
-set sts=4 sw=4 et
-set cms=#%s

bitbake/contrib/vim/plugin/newbb.vim

@@ -1,85 +0,0 @@
-" Vim plugin file
-" Purpose:	Create a template for new bb files
-" Author:	Ricardo Salveti <rsalveti@gmail.com>
-" Copyright:	Copyright (C) 2008 Ricardo Salveti <rsalveti@gmail.com>
-"
-" This file is licensed under the MIT license, see COPYING.MIT in
-" this source distribution for the terms.
-"
-" Based on the gentoo-syntax package
-"
-" Will try to use git to find the user name and email
-
-if &compatible || v:version < 600
-    finish
-endif
-
-fun! <SID>GetUserName()
-    let l:user_name = system("git config --get user.name")
-    if v:shell_error
-        return "Unknown User"
-    else
-        return substitute(l:user_name, "\n", "", "")
-endfun
-
-fun! <SID>GetUserEmail()
-    let l:user_email = system("git config --get user.email")
-    if v:shell_error
-        return "unknow@user.org"
-    else
-        return substitute(l:user_email, "\n", "", "")
-endfun
-
-fun! BBHeader()
-    let l:current_year = strftime("%Y")
-    let l:user_name = <SID>GetUserName()
-    let l:user_email = <SID>GetUserEmail()
-    0 put ='# Copyright (C) ' . l:current_year .
-                \ ' ' . l:user_name . ' <' . l:user_email . '>'
-    put ='# Released under the MIT license (see COPYING.MIT for the terms)'
-    $
-endfun
-
-fun! NewBBTemplate()
-    let l:paste = &paste
-    set nopaste
-    
-    " Get the header
-    call BBHeader()
-
-    " New the bb template
-    put ='DESCRIPTION = \"\"'
-    put ='HOMEPAGE = \"\"'
-    put ='LICENSE = \"\"' 
-    put ='SECTION = \"\"'
-    put ='DEPENDS = \"\"'
-    put ='PR = \"r0\"'
-    put =''
-    put ='SRC_URI = \"\"'
-
-    " Go to the first place to edit
-    0
-    /^DESCRIPTION =/
-    exec "normal 2f\""
-
-    if paste == 1
-        set paste
-    endif
-endfun
-
-if !exists("g:bb_create_on_empty")
-    let g:bb_create_on_empty = 1
-endif
-
-" disable in case of vimdiff
-if v:progname =~ "vimdiff"
-    let g:bb_create_on_empty = 0
-endif
-
-augroup NewBB
-    au BufNewFile *.bb
-                \ if g:bb_create_on_empty |
-                \    call NewBBTemplate() |
-                \ endif
-augroup END
-

bitbake/contrib/vim/syntax/bitbake.vim

@@ -1,126 +1,120 @@
 " Vim syntax file
-" Language:     BitBake bb/bbclasses/inc
-" Author:       Chris Larson <kergoth@handhelds.org>
-"               Ricardo Salveti <rsalveti@rsalveti.net>
-" Copyright:    Copyright (C) 2004  Chris Larson <kergoth@handhelds.org>
-"               Copyright (C) 2008  Ricardo Salveti <rsalveti@rsalveti.net>
 "
+" Copyright (C) 2004  Chris Larson <kergoth@handhelds.org>
 " This file is licensed under the MIT license, see COPYING.MIT in
 " this source distribution for the terms.
 "
-" Syntax highlighting for bb, bbclasses and inc files.
+" Language:	BitBake
+" Maintainer:	Chris Larson <kergoth@handhelds.org>
+" Filenames:	*.bb, *.bbclass
+
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+syn case match
+
+
+" Catch incorrect syntax (only matches if nothing else does)
 "
-" It's an entirely new type, just has specific syntax in shell and python code
+syn match bbUnmatched		"."
 
-if &compatible || v:version < 600
-    finish
-endif
-if exists("b:current_syntax")
-    finish
-endif
 
+" Other
+
+syn match bbComment		"^#.*$" display contains=bbTodo
+syn keyword bbTodo		TODO FIXME XXX contained
+syn match bbDelimiter		"[(){}=]" contained
+syn match bbQuote		/['"]/ contained
+syn match bbArrayBrackets	"[\[\]]" contained
+
+
+" BitBake strings
+
+syn match bbContinue		"\\$"
+syn region bbString		matchgroup=bbQuote start=/"/ skip=/\\$/ excludenl end=/"/ contained keepend contains=bbTodo,bbContinue,bbVarDeref
+syn region bbString		matchgroup=bbQuote start=/'/ skip=/\\$/ excludenl end=/'/ contained keepend contains=bbTodo,bbContinue,bbVarDeref
+
+
+" BitBake variable metadata
+
+syn keyword bbExportFlag	export contained nextgroup=bbIdentifier skipwhite
+syn match bbVarDeref	"${[a-zA-Z0-9\-_\.]\+}" contained
+syn match bbVarDef		"^\(export\s*\)\?\([a-zA-Z0-9\-_\.]\+\(_[${}a-zA-Z0-9\-_\.]\+\)\?\)\s*\(:=\|+=\|=+\|\.=\|=\.\|?=\|=\)\@=" contains=bbExportFlag,bbIdentifier,bbVarDeref nextgroup=bbVarEq
+
+syn match bbIdentifier		"[a-zA-Z0-9\-_\.]\+" display contained
+"syn keyword bbVarEq	= display contained nextgroup=bbVarValue
+syn match bbVarEq		"\(:=\|+=\|=+\|\.=\|=\.\|?=\|=\)" contained nextgroup=bbVarValue
+syn match bbVarValue		".*$" contained contains=bbString,bbVarDeref
+
+
+" BitBake variable metadata flags
+syn match bbVarFlagDef		"^\([a-zA-Z0-9\-_\.]\+\)\(\[[a-zA-Z0-9\-_\.]\+\]\)\@=" contains=bbIdentifier nextgroup=bbVarFlagFlag
+syn region bbVarFlagFlag	matchgroup=bbArrayBrackets start="\[" end="\]\s*\(=\)\@=" keepend excludenl contained contains=bbIdentifier nextgroup=bbVarEq
+"syn match bbVarFlagFlag		"\[\([a-zA-Z0-9\-_\.]\+\)\]\s*\(=\)\@=" contains=bbIdentifier nextgroup=bbVarEq
+
+
+" Functions!
+syn match bbFunction	"\h\w*" display contained
+
+
+" BitBake python metadata
 syn include @python syntax/python.vim
 if exists("b:current_syntax")
   unlet b:current_syntax
 endif
 
-" BitBake syntax
+syn keyword bbPythonFlag	python contained nextgroup=bbFunction
+syn match bbPythonFuncDef	"^\(python\s\+\)\(\w\+\)\?\(\s*()\s*\)\({\)\@=" contains=bbPythonFlag,bbFunction,bbDelimiter nextgroup=bbPythonFuncRegion skipwhite
+syn region bbPythonFuncRegion	matchgroup=bbDelimiter start="{\s*$" end="^}\s*$" keepend contained contains=@python
+"hi def link bbPythonFuncRegion	Comment
 
-" Matching case
-syn case match
-
-" Indicates the error when nothing is matched
-syn match bbUnmatched           "."
-
-" Comments
-syn cluster bbCommentGroup      contains=bbTodo,@Spell
-syn keyword bbTodo              COMBAK FIXME TODO XXX contained
-syn match bbComment             "#.*$" contains=@bbCommentGroup
-
-" String helpers
-syn match bbQuote               +['"]+ contained 
-syn match bbDelimiter           "[(){}=]" contained
-syn match bbArrayBrackets       "[\[\]]" contained
-
-" BitBake strings
-syn match bbContinue            "\\$"
-syn region bbString             matchgroup=bbQuote start=+"+ skip=+\\$+ end=+"+ contained contains=bbTodo,bbContinue,bbVarDeref,bbVarPyValue,@Spell
-syn region bbString             matchgroup=bbQuote start=+'+ skip=+\\$+ end=+'+ contained contains=bbTodo,bbContinue,bbVarDeref,bbVarPyValue,@Spell
-
-" Vars definition
-syn match bbExport            "^export" nextgroup=bbIdentifier skipwhite
-syn keyword bbExportFlag        export contained nextgroup=bbIdentifier skipwhite
-syn match bbIdentifier          "[a-zA-Z0-9\-_\.\/\+]\+" display contained
-syn match bbVarDeref            "${[a-zA-Z0-9\-_\.\/\+]\+}" contained
-syn match bbVarEq               "\(:=\|+=\|=+\|\.=\|=\.\|?=\|??=\|=\)" contained nextgroup=bbVarValue
-syn match bbVarDef              "^\(export\s*\)\?\([a-zA-Z0-9\-_\.\/\+]\+\(_[${}a-zA-Z0-9\-_\.\/\+]\+\)\?\)\s*\(:=\|+=\|=+\|\.=\|=\.\|?=\|??=\|=\)\@=" contains=bbExportFlag,bbIdentifier,bbVarDeref nextgroup=bbVarEq
-syn match bbVarValue            ".*$" contained contains=bbString,bbVarDeref,bbVarPyValue
-syn region bbVarPyValue         start=+${@+ skip=+\\$+ end=+}+ contained contains=@python
-
-" Vars metadata flags
-syn match bbVarFlagDef          "^\([a-zA-Z0-9\-_\.]\+\)\(\[[a-zA-Z0-9\-_\.]\+\]\)\@=" contains=bbIdentifier nextgroup=bbVarFlagFlag
-syn region bbVarFlagFlag        matchgroup=bbArrayBrackets start="\[" end="\]\s*\(=\|+=\|=+\|?=\)\@=" contained contains=bbIdentifier nextgroup=bbVarEq
-
-" Includes and requires
-syn keyword bbInclude           inherit include require contained 
-syn match bbIncludeRest         ".*$" contained contains=bbString,bbVarDeref
-syn match bbIncludeLine         "^\(inherit\|include\|require\)\s\+" contains=bbInclude nextgroup=bbIncludeRest
-
-" Add taks and similar
-syn keyword bbStatement         addtask addhandler after before EXPORT_FUNCTIONS contained
-syn match bbStatementRest       ".*$" skipwhite contained contains=bbStatement
-syn match bbStatementLine       "^\(addtask\|addhandler\|after\|before\|EXPORT_FUNCTIONS\)\s\+" contains=bbStatement nextgroup=bbStatementRest
-
-" OE Important Functions
-syn keyword bbOEFunctions       do_fetch do_unpack do_patch do_configure do_compile do_stage do_install do_package contained
-
-" Generic Functions
-syn match bbFunction            "\h[0-9A-Za-z_-]*" display contained contains=bbOEFunctions
 
 " BitBake shell metadata
 syn include @shell syntax/sh.vim
 if exists("b:current_syntax")
   unlet b:current_syntax
 endif
-syn keyword bbShFakeRootFlag    fakeroot contained
-syn match bbShFuncDef           "^\(fakeroot\s*\)\?\([0-9A-Za-z_${}-]\+\)\(python\)\@<!\(\s*()\s*\)\({\)\@=" contains=bbShFakeRootFlag,bbFunction,bbVarDeref,bbDelimiter nextgroup=bbShFuncRegion skipwhite
-syn region bbShFuncRegion       matchgroup=bbDelimiter start="{\s*$" end="^}\s*$" contained contains=@shell
 
-" Python value inside shell functions
-syn region shDeref         start=+${@+ skip=+\\$+ excludenl end=+}+ contained contains=@python
+syn keyword bbFakerootFlag	fakeroot contained nextgroup=bbFunction
+syn match bbShellFuncDef	"^\(fakeroot\s*\)\?\(\w\+\)\(python\)\@<!\(\s*()\s*\)\({\)\@=" contains=bbFakerootFlag,bbFunction,bbDelimiter nextgroup=bbShellFuncRegion skipwhite
+syn region bbShellFuncRegion	matchgroup=bbDelimiter start="{\s*$" end="^}\s*$" keepend contained contains=@shell
+"hi def link bbShellFuncRegion	Comment
 
-" BitBake python metadata
-syn keyword bbPyFlag            python contained
-syn match bbPyFuncDef           "^\(python\s\+\)\([0-9A-Za-z_${}-]\+\)\?\(\s*()\s*\)\({\)\@=" contains=bbPyFlag,bbFunction,bbVarDeref,bbDelimiter nextgroup=bbPyFuncRegion skipwhite
-syn region bbPyFuncRegion       matchgroup=bbDelimiter start="{\s*$" end="^}\s*$" contained contains=@python
 
 " BitBake 'def'd python functions
-syn keyword bbPyDef             def contained
-syn region bbPyDefRegion        start='^\(def\s\+\)\([0-9A-Za-z_-]\+\)\(\s*(.*)\s*\):\s*$' end='^\(\s\|$\)\@!' contains=@python
+syn keyword bbDef	def	contained
+syn region bbDefRegion		start='^def\s\+\w\+\s*([^)]*)\s*:\s*$' end='^\(\s\|$\)\@!' contains=@python
 
-" Highlighting Definitions
-hi def link bbUnmatched         Error
-hi def link bbInclude           Include
-hi def link bbTodo              Todo
-hi def link bbComment           Comment
-hi def link bbQuote             String
-hi def link bbString            String
-hi def link bbDelimiter         Keyword
-hi def link bbArrayBrackets     Statement
-hi def link bbContinue          Special
-hi def link bbExport            Type
-hi def link bbExportFlag        Type
-hi def link bbIdentifier	    Identifier
-hi def link bbVarDeref          PreProc
-hi def link bbVarDef            Identifier
-hi def link bbVarValue          String
-hi def link bbShFakeRootFlag    Type
-hi def link bbFunction          Function
-hi def link bbPyFlag            Type
-hi def link bbPyDef             Statement
-hi def link bbStatement         Statement
-hi def link bbStatementRest     Identifier
-hi def link bbOEFunctions       Special
-hi def link bbVarPyValue        PreProc
+
+" BitBake statements
+syn keyword bbStatement		include inherit require addtask addhandler EXPORT_FUNCTIONS display contained
+syn match bbStatementLine	"^\(include\|inherit\|require\|addtask\|addhandler\|EXPORT_FUNCTIONS\)\s\+" contains=bbStatement nextgroup=bbStatementRest
+syn match bbStatementRest		".*$" contained contains=bbString,bbVarDeref
+
+" Highlight
+"
+hi def link bbArrayBrackets	Statement
+hi def link bbUnmatched		Error
+hi def link bbVarDeref		String
+hi def link bbContinue		Special
+hi def link bbDef		Statement
+hi def link bbPythonFlag	Type
+hi def link bbExportFlag	Type
+hi def link bbFakerootFlag	Type
+hi def link bbStatement		Statement
+hi def link bbString		String
+hi def link bbTodo		Todo
+hi def link bbComment		Comment
+hi def link bbOperator		Operator
+hi def link bbError		Error
+hi def link bbFunction		Function
+hi def link bbDelimiter		Delimiter
+hi def link bbIdentifier	Identifier
+hi def link bbVarEq		Operator
+hi def link bbQuote		String
+hi def link bbVarValue		String
 
 let b:current_syntax = "bb"

bitbake/doc/Makefile

@@ -1,77 +0,0 @@
-# This is a single Makefile to handle all generated BitBake documents.
-# The Makefile needs to live in the documentation directory and all figures used
-# in any manuals must be .PNG files and live in the individual book's figures
-# directory.
-#
-# The Makefile has these targets:
-#
-#    pdf:      generates a PDF version of a manual.
-#    html:     generates an HTML version of a manual.
-#    tarball:  creates a tarball for the doc files.
-#    validate: validates
-#    clean:    removes files
-#
-# The Makefile generates an HTML and PDF version of every document.  The
-# variable DOC indicates the folder name for a given manual.
-#
-# To build a manual, you must invoke 'make' with the DOC argument.
-#
-# Examples:
-#
-#     make DOC=user-manual
-#     make pdf DOC=user-manual
-#
-# The first example generates the HTML and PDF versions of the User Manual.
-# The second example generates the HTML version only of the User Manual. 
-#
-
-ifeq ($(DOC),user-manual)
-XSLTOPTS = --stringparam html.stylesheet user-manual-style.css \
-           --stringparam  chapter.autolabel 1 \
-           --stringparam  section.autolabel 1 \
-           --stringparam  section.label.includes.component.label 1 \
-           --xinclude
-ALLPREQ = html pdf tarball
-TARFILES = user-manual-style.css user-manual.html user-manual.pdf figures/bitbake-title.png
-MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf
-FIGURES = figures
-STYLESHEET = $(DOC)/*.css
-
-endif
-
-##
-# These URI should be rewritten by your distribution's xml catalog to
-# match your localy installed XSL stylesheets.
-XSL_BASE_URI  = http://docbook.sourceforge.net/release/xsl/current
-XSL_XHTML_URI = $(XSL_BASE_URI)/xhtml/docbook.xsl
-
-all: $(ALLPREQ)
-
-pdf:
-ifeq ($(DOC),user-manual)
-	@echo " "
-	@echo "********** Building."$(DOC)
-	@echo " "
-	cd $(DOC); ../tools/docbook-to-pdf $(DOC).xml ../template; cd ..
-endif
-
-html:
-ifeq ($(DOC),user-manual)
-#       See http://www.sagehill.net/docbookxsl/HtmlOutput.html
-	@echo " "
-	@echo "******** Building "$(DOC)
-	@echo " "
-	cd $(DOC); xsltproc $(XSLTOPTS) -o $(DOC).html $(DOC)-customization.xsl $(DOC).xml; cd ..
-endif
-
-tarball: html
-	@echo " "
-	@echo "******** Creating Tarball of document files"
-	@echo " "
-	cd $(DOC); tar -cvzf $(DOC).tgz $(TARFILES); cd ..
-
-validate:
-	cd $(DOC); xmllint --postvalid --xinclude --noout $(DOC).xml; cd ..
-
-clean:
-	rm -rf $(MANUALS); rm $(DOC)/$(DOC).tgz;

bitbake/doc/README

@@ -1,39 +0,0 @@
-Documentation
-=============
-
-This is the directory that contains the BitBake documentation. 
-
-Manual Organization
-===================
-
-Folders exist for individual manuals as follows:
-
-* user-manual      - The BitBake User Manual 
-
-Each folder is self-contained regarding content and figures.
-
-If you want to find HTML versions of the BitBake manuals on the web, 
-go to http://www.openembedded.org/wiki/Documentation. 
-
-Makefile
-========
-
-The Makefile processes manual directories to create HTML, PDF,
-tarballs, etc.  Details on how the Makefile work are documented
-inside the Makefile.  See that file for more information.
-
-To build a manual, you run the make command and pass it the name
-of the folder containing the manual's contents. 
-For example, the following command run from the documentation directory 
-creates an HTML and a PDF version of the BitBake User Manual.
-The DOC variable specifies the manual you are making:
-
-     $ make DOC=user-manual
-
-template
-========
-Contains various templates, fonts, and some old PNG files.
-
-tools
-=====
-Contains a tool to convert the DocBook files to PDF format.

bitbake/doc/bitbake.1

@@ -32,7 +32,7 @@ command.
 \fBbitbake\fP is a program that executes the specified task (default is 'build')
 for a given set of BitBake files.
 .br
-It expects that BBFILES is defined, which is a space separated list of files to
+It expects that BBFILES is defined, which is a space seperated list of files to
 be executed. BBFILES does support wildcards.
 .br
 Default BBFILES are the .bb files in the current directory.
@@ -54,9 +54,6 @@ continue as much as possible after an error. While the target that failed, and
 those that depend on it, cannot be remade, the other dependencies of these
 targets can be processed all the same.
 .TP
-.B \-a, \-\-tryaltconfigs
-continue with builds by trying to use alternative providers where possible.
-.TP
 .B \-f, \-\-force
 force run of specified cmd, regardless of stamp status
 .TP
@@ -67,7 +64,7 @@ drop into the interactive mode also called the BitBake shell.
 Specify task to execute. Note that this only executes the specified task for
 the providee and the packages it depends on, i.e. 'compile' does not implicitly
 call stage for the dependencies (IOW: use only if you know what you are doing).
-Depending on the base.bbclass a listtasks task is defined and will show
+Depending on the base.bbclass a listtaks tasks is defined and will show
 available tasks.
 .TP
 .B \-rFILE, \-\-read=FILE 
@@ -85,6 +82,9 @@ don't execute, just go through the motions
 .B \-p, \-\-parse-only
 quit after parsing the BB files (developers only)
 .TP
+.B \-d, \-\-disable-psyco
+disable using the psyco just-in-time compiler (not recommended)
+.TP
 .B \-s, \-\-show-versions
 show current and preferred versions of all packages
 .TP
@@ -97,37 +97,12 @@ emit the dependency trees of the specified packages in the dot syntax
 .B \-IIGNORED\_DOT\_DEPS, \-\-ignore-deps=IGNORED_DOT_DEPS
 Stop processing at the given list of dependencies when generating dependency
 graphs. This can help to make the graph more appealing
-.TP
-.B \-lDEBUG_DOMAINS, \-\-log-domains=DEBUG_DOMAINS
-Show debug logging for the specified logging domains
-.TP
-.B \-P, \-\-profile
-profile the command and print a report
-.TP
-.B \-uUI, \-\-ui=UI
-User interface to use. Currently, hob, depexp, goggle or ncurses can be specified as UI.
-.TP
-.B \-tSERVERTYPE, \-\-servertype=SERVERTYPE
-Choose which server to use, none, process or xmlrpc.
-.TP
-.B \-\-revisions-changed
-Set the exit code depending on whether upstream floating revisions have changed or not.
-.TP
-.B \-\-server-only
-Run bitbake without UI,  the frontend can connect with bitbake server itself.
-.TP
-.B \-BBIND, \-\-bind=BIND
-The name/address for the bitbake server to bind to.
-.TP
-.B \-\-no\-setscene
-Do not run any setscene tasks, forces builds.
-
-.SH ENVIRONMENT VARIABLES
-bitbake uses the following environment variables to control its
-operation:
-.TP
-.B BITBAKE_UI
-The bitbake user interface; overridden by the \fB-u\fP commandline option.
+.\"
+.\" Next option is only in BitBake 1.7.x (trunk)
+.\"
+.\".TP
+.\".B \-lDEBUG_DOMAINS, \-\-log-domains=DEBUG_DOMAINS
+.\"Show debug logging for the specified logging domains
 
 .SH AUTHORS
 BitBake was written by 

bitbake/doc/manual/Makefile

@@ -0,0 +1,56 @@
+topdir = .
+manual = $(topdir)/usermanual.xml
+# types = pdf txt rtf ps xhtml html man tex texi dvi
+# types = pdf txt
+types = $(xmltotypes) $(htmltypes)
+xmltotypes = pdf txt
+htmltypes = html xhtml
+htmlxsl = $(if $(filter $@,$(foreach type,$(htmltypes),$(type)-nochunks)),http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl,http://docbook.sourceforge.net/release/xsl/current/$@/chunk.xsl)
+htmlcssfile = docbook.css
+htmlcss = $(topdir)/html.css
+# htmlcssfile =
+# htmlcss =
+cleanfiles = $(foreach i,$(types),$(topdir)/$(i))
+
+ifdef DEBUG
+define command
+	$(1)
+endef
+else
+define command
+	@echo $(2) $(3) $(4)
+	@$(1) >/dev/null
+endef
+endif
+
+all: $(types)
+
+lint: $(manual) FORCE
+	$(call command,xmllint --xinclude --postvalid --noout $(manual),XMLLINT $(manual))
+
+$(types) $(foreach type,$(htmltypes),$(type)-nochunks): lint FORCE
+
+$(foreach type,$(htmltypes),$(type)-nochunks): $(if $(htmlcss),$(htmlcss)) $(manual)
+	@mkdir -p $@
+ifdef htmlcss
+	$(call command,install -m 0644 $(htmlcss) $@/$(htmlcssfile),CP $(htmlcss) $@/$(htmlcssfile))
+endif
+	$(call command,xsltproc --stringparam base.dir $@/ $(if $(htmlcssfile),--stringparam html.stylesheet $(htmlcssfile)) $(htmlxsl) $(manual) > $@/index.$(patsubst %-nochunks,%,$@),XSLTPROC $@ $(manual))
+
+$(htmltypes): $(if $(htmlcss),$(htmlcss)) $(manual)
+	@mkdir -p $@
+ifdef htmlcss
+	$(call command,install -m 0644 $(htmlcss) $@/$(htmlcssfile),CP $(htmlcss) $@/$(htmlcssfile))
+endif
+	$(call command,xsltproc --stringparam base.dir $@/ $(if $(htmlcssfile),--stringparam html.stylesheet $(htmlcssfile)) $(htmlxsl) $(manual),XSLTPROC $@ $(manual))
+
+$(xmltotypes): $(manual)
+	$(call command,xmlto --extensions -o $(topdir)/$@ $@ $(manual),XMLTO $@ $(manual))
+
+clean:
+	rm -rf $(cleanfiles)
+
+$(foreach i,$(types) $(foreach type,$(htmltypes),$(type)-nochunks),clean-$(i)):
+	rm -rf $(patsubst clean-%,%,$@)
+
+FORCE: 

bitbake/doc/manual/usermanual.xml

@@ -0,0 +1,518 @@
+<?xml version="1.0"?>
+<!--
+  ex:ts=4:sw=4:sts=4:et
+  -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+-->
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<book>
+    <bookinfo>
+        <title>BitBake User Manual</title>
+        <authorgroup>
+            <corpauthor>BitBake Team</corpauthor>
+        </authorgroup>
+        <copyright>
+            <year>2004, 2005, 2006</year>
+            <holder>Chris Larson</holder>
+            <holder>Phil Blundell</holder>
+        </copyright>
+        <legalnotice>
+            <para>This work is licensed under the Creative Commons Attribution License. To view a copy of this license, visit <ulink url="http://creativecommons.org/licenses/by/2.5/">http://creativecommons.org/licenses/by/2.5/</ulink> or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.</para>
+        </legalnotice>
+    </bookinfo>
+    <chapter>
+        <title>Introduction</title>
+        <section>
+            <title>Overview</title>
+            <para>BitBake is, at its simplest, a tool for executing
+tasks and managing metadata.  As such, its similarities to GNU make and other
+build tools are readily apparent.  It was inspired by Portage, the package management system used by the Gentoo Linux distribution.  BitBake is the basis of the <ulink url="http://www.openembedded.org/">OpenEmbedded</ulink> project, which is being used to build and maintain a number of embedded Linux distributions, including OpenZaurus and Familiar.</para>
+        </section>
+        <section>
+            <title>Background and Goals</title>
+            <para>Prior to BitBake, no other build tool adequately met
+the needs of an aspiring embedded Linux distribution.  All of the
+buildsystems used by traditional desktop Linux distributions lacked
+important functionality, and none of the ad-hoc
+<emphasis>buildroot</emphasis> systems, prevalent in the
+embedded space, were scalable or maintainable.</para>
+
+      <para>Some important goals for BitBake were:
+            <itemizedlist>
+                <listitem><para>Handle crosscompilation.</para></listitem>
+                <listitem><para>Handle interpackage dependencies (build time on target architecture, build time on native architecture, and runtime).</para></listitem>
+                <listitem><para>Support running any number of tasks within a given package, including, but not limited to, fetching upstream sources, unpacking them, patching them, configuring them, et cetera.</para></listitem>
+                <listitem><para>Must be linux distribution agnostic (both build and target).</para></listitem>
+                <listitem><para>Must be architecture agnostic</para></listitem>
+                <listitem><para>Must support multiple build and target operating systems (including cygwin, the BSDs, etc).</para></listitem>
+                <listitem><para>Must be able to be self contained, rather than tightly integrated into the build machine's root filesystem.</para></listitem>
+                <listitem><para>There must be a way to handle conditional metadata (on target architecture, operating system, distribution, machine).</para></listitem>
+                <listitem><para>It must be easy for the person using the tools to supply their own local metadata and packages to operate against.</para></listitem>
+                <listitem><para>Must make it easy to collaborate
+between multiple projects using BitBake for their
+builds.</para></listitem>
+		<listitem><para>Should provide an inheritance mechanism to
+share common metadata between many packages.</para></listitem>
+                <listitem><para>Et cetera...</para></listitem>
+            </itemizedlist>
+        </para>
+        <para>BitBake satisfies all these and many more.  Flexibility and power have always been the priorities.  It is highly extensible, supporting embedded Python code and execution of any arbitrary tasks.</para>
+        </section>
+    </chapter>
+    <chapter>
+        <title>Metadata</title>
+        <section>
+            <title>Description</title>
+            <itemizedlist>
+                <para>BitBake metadata can be classified into 3 major areas:</para>
+                <listitem>
+                    <para>Configuration Files</para>
+                </listitem>
+                <listitem>
+                    <para>.bb Files</para>
+                </listitem>
+                <listitem>
+                    <para>Classes</para>
+                </listitem>
+            </itemizedlist>
+            <para>What follows are a large number of examples of BitBake metadata.  Any syntax which isn't supported in any of the aforementioned areas will be documented as such.</para>
+            <section>
+                <title>Basic variable setting</title>
+                <para><screen><varname>VARIABLE</varname> = "value"</screen></para>
+                <para>In this example, <varname>VARIABLE</varname> is <literal>value</literal>.</para>
+            </section>
+            <section>
+                <title>Variable expansion</title>
+                <para>BitBake supports variables referencing one another's contents using a syntax which is similar to shell scripting</para>
+                <para><screen><varname>A</varname> = "aval"
+<varname>B</varname> = "pre${A}post"</screen></para>
+                <para>This results in <varname>A</varname> containing <literal>aval</literal> and <varname>B</varname> containing <literal>preavalpost</literal>.</para>
+            </section>
+            <section>
+                <title>Immediate variable expansion (:=)</title>
+                <para>:= results in a variable's contents being expanded immediately, rather than when the variable is actually used.</para>
+                <para><screen><varname>T</varname> = "123"
+<varname>A</varname> := "${B} ${A} test ${T}"
+<varname>T</varname> = "456"
+<varname>B</varname> = "${T} bval"
+
+<varname>C</varname> = "cval"
+<varname>C</varname> := "${C}append"</screen></para>
+                <para>In that example, <varname>A</varname> would contain <literal> test 123</literal>, <varname>B</varname> would contain <literal>456 bval</literal>, and <varname>C</varname> would be <literal>cvalappend</literal>.</para>
+            </section>
+            <section>
+                <title>Appending (+=) and prepending (=+)</title>
+                <para><screen><varname>B</varname> = "bval"
+<varname>B</varname> += "additionaldata"
+<varname>C</varname> = "cval"
+<varname>C</varname> =+ "test"</screen></para>
+                <para>In this example, <varname>B</varname> is now <literal>bval additionaldata</literal> and <varname>C</varname> is <literal>test cval</literal>.</para>
+            </section>
+            <section>
+                <title>Appending (.=) and prepending (=.) without spaces</title>
+                    <para><screen><varname>B</varname> = "bval"
+<varname>B</varname> .= "additionaldata"
+<varname>C</varname> = "cval"
+<varname>C</varname> =. "test"</screen></para>
+                <para>In this example, <varname>B</varname> is now <literal>bvaladditionaldata</literal> and <varname>C</varname> is <literal>testcval</literal>. In contrast to the above Appending and Prepending operators no additional space
+will be introduced.</para>
+            </section>
+            <section>
+                <title>Conditional metadata set</title>
+                <para>OVERRIDES is a <quote>:</quote> seperated variable containing each item you want to satisfy conditions.  So, if you have a variable which is conditional on <quote>arm</quote>, and <quote>arm</quote> is in OVERRIDES, then the <quote>arm</quote> specific version of the variable is used rather than the non-conditional version.  Example:</para>
+                <para><screen><varname>OVERRIDES</varname> = "architecture:os:machine"
+<varname>TEST</varname> = "defaultvalue"
+<varname>TEST_os</varname> = "osspecificvalue"
+<varname>TEST_condnotinoverrides</varname> = "othercondvalue"</screen></para>
+                <para>In this example, <varname>TEST</varname> would be <literal>osspecificvalue</literal>, due to the condition <quote>os</quote> being in <varname>OVERRIDES</varname>.</para>
+            </section>
+            <section>
+                <title>Conditional appending</title>
+                <para>BitBake also supports appending and prepending to variables based on whether something is in OVERRIDES.  Example:</para>
+                <para><screen><varname>DEPENDS</varname> = "glibc ncurses"
+<varname>OVERRIDES</varname> = "machine:local"
+<varname>DEPENDS_append_machine</varname> = " libmad"</screen></para>
+                <para>In this example, <varname>DEPENDS</varname> is set to <literal>glibc ncurses libmad</literal>.</para>
+            </section>
+            <section>
+                <title>Inclusion</title>
+                <para>Next, there is the <literal>include</literal> directive, which causes BitBake to parse in whatever file you specify, and insert it at that location, which is not unlike <command>make</command>.  However, if the path specified on the <literal>include</literal> line is a relative path, BitBake will locate the first one it can find within <envar>BBPATH</envar>.</para>
+            </section>
+            <section>
+                <title>Requiring Inclusion</title>
+                <para>In contrast to the <literal>include</literal> directive, <literal>require</literal> will
+raise an ParseError if the to be included file can not be found. Otherwise it will behave just like the <literal>
+include</literal> directive.</para>
+            </section>
+            <section>
+                <title>Python variable expansion</title>
+                <para><screen><varname>DATE</varname> = "${@time.strftime('%Y%m%d',time.gmtime())}"</screen></para>
+                <para>This would result in the <varname>DATE</varname> variable containing today's date.</para>
+            </section>
+            <section>
+                <title>Defining executable metadata</title>
+                <para><emphasis>NOTE:</emphasis> This is only supported in .bb and .bbclass files.</para>
+                <para><screen>do_mytask () {
+    echo "Hello, world!"
+}</screen></para>
+                <para>This is essentially identical to setting a variable, except that this variable happens to be executable shell code.</para>
+                <para><screen>python do_printdate () {
+    import time
+    print time.strftime('%Y%m%d', time.gmtime())
+}</screen></para>
+                <para>This is the similar to the previous, but flags it as python so that BitBake knows it is python code.</para>
+            </section>
+            <section>
+                <title>Defining python functions into the global python namespace</title>
+                <para><emphasis>NOTE:</emphasis> This is only supported in .bb and .bbclass files.</para>
+                <para><screen>def get_depends(bb, d):
+    if bb.data.getVar('SOMECONDITION', d, True):
+        return "dependencywithcond"
+    else:
+        return "dependency"
+
+<varname>SOMECONDITION</varname> = "1"
+<varname>DEPENDS</varname> = "${@get_depends(bb, d)}"</screen></para>
+                <para>This would result in <varname>DEPENDS</varname> containing <literal>dependencywithcond</literal>.</para>
+            </section>
+            <section>
+                <title>Variable Flags</title>
+                <para>Variables can have associated flags which provide a way of tagging extra information onto a variable. Several flags are used internally by bitbake but they can be used externally too if needed. The standard operations mentioned above also work on flags.</para>
+                <para><screen><varname>VARIABLE</varname>[<varname>SOMEFLAG</varname>] = "value"</screen></para>
+                <para>In this example, <varname>VARIABLE</varname> has a flag, <varname>SOMEFLAG</varname> which is set to <literal>value</literal>.</para>
+            </section>
+            <section>
+                <title>Inheritance</title>
+                <para><emphasis>NOTE:</emphasis> This is only supported in .bb and .bbclass files.</para>
+                <para>The <literal>inherit</literal> directive is a means of specifying what classes of functionality your .bb requires.  It is a rudamentary form of inheritence.  For example, you can easily abstract out the tasks involved in building a package that uses autoconf and automake, and put that into a bbclass for your packages to make use of.  A given bbclass is located by searching for classes/filename.oeclass in <envar>BBPATH</envar>, where filename is what you inherited.</para>
+            </section>
+            <section>
+                <title>Tasks</title>
+                <para><emphasis>NOTE:</emphasis> This is only supported in .bb and .bbclass files.</para>
+                <para>In BitBake, each step that needs to be run for a given .bb is known as a task.  There is a command <literal>addtask</literal> to add new tasks (must be a defined python executable metadata and must start with <quote>do_</quote>) and describe intertask dependencies.</para>
+                <para><screen>python do_printdate () {
+    import time
+    print time.strftime('%Y%m%d', time.gmtime())
+}
+
+addtask printdate before do_build</screen></para>
+                <para>This defines the necessary python function and adds it as a task which is now a dependency of do_build (the default task).  If anyone executes the do_build task, that will result in do_printdate being run first.</para>
+            </section>
+            <section>
+                <title>Events</title>
+                <para><emphasis>NOTE:</emphasis> This is only supported in .bb and .bbclass files.</para>
+                <para>BitBake allows to install event handlers.  Events are triggered at certain points during operation, such as, the beginning of operation against a given .bb, the start of a given task, task failure, task success, et cetera.  The intent was to make it easy to do things like email notifications on build failure.</para>
+                <para><screen>addhandler myclass_eventhandler
+python myclass_eventhandler() {
+    from bb.event import NotHandled, getName
+    from bb import data
+
+    print "The name of the Event is %s" % getName(e)
+    print "The file we run for is %s" % data.getVar('FILE', e.data, True)
+
+    return NotHandled
+}
+</screen></para><para>
+This event handler gets called every time an event is triggered. A global variable <varname>e</varname> is defined. <varname>e</varname>.data contains an instance of bb.data. With the getName(<varname>e</varname>)
+method one can get the name of the triggered event.</para><para>The above event handler prints the name
+of the event and the content of the <varname>FILE</varname> variable.</para>
+            </section>
+        </section>
+        <section>
+            <title>Dependency Handling</title>
+            <para>Bitbake 1.7.x onwards works with the metadata at the task level since this is optimal when dealing with multiple threads of execution. A robust method of specifing task dependencies is therefore needed. </para>
+            <section>
+                <title>Dependencies internal to the .bb file</title>
+                <para>Where the dependencies are internal to a given .bb file, the dependencies are handled by the previously detailed addtask directive.</para>
+            </section>
+
+            <section>
+                <title>DEPENDS</title>
+                <para>DEPENDS is taken to specify build time dependencies. The 'deptask' flag for tasks is used to signify the task of each DEPENDS which must have completed before that task can be executed.</para>
+                <para><screen>do_configure[deptask] = "do_populate_staging"</screen></para>
+                <para>means the do_populate_staging task of each item in DEPENDS must have completed before do_configure can execute.</para>
+            </section>
+            <section>
+                <title>RDEPENDS</title>
+                <para>RDEPENDS is taken to specify runtime dependencies. The 'rdeptask' flag for tasks is used to signify the task of each RDEPENDS which must have completed before that task can be executed.</para>
+                <para><screen>do_package_write[rdeptask] = "do_package"</screen></para>
+                <para>means the do_package task of each item in RDEPENDS must have completed before do_package_write can execute.</para>
+            </section>
+            <section>
+                <title>Recursive DEPENDS</title>
+                <para>These are specified with the 'recdeptask' flag and is used signify the task(s) of each DEPENDS which must have completed before that task can be executed. It applies recursively so also, the DEPENDS of each item in the original DEPENDS must be met and so on.</para>
+            </section>
+            <section>
+                <title>Recursive RDEPENDS</title>
+                <para>These are specified with the 'recrdeptask' flag and is used signify the task(s) of each RDEPENDS which must have completed before that task can be executed. It applies recursively so also, the RDEPENDS of each item in the original RDEPENDS must be met and so on. It also runs all DEPENDS first too.</para>
+            </section>
+            <section>
+                <title>Inter Task</title>
+                <para>The 'depends' flag for tasks is a more generic form of which allows an interdependency on specific tasks rather than specifying the data in DEPENDS or RDEPENDS.</para>
+                <para><screen>do_patch[depends] = "quilt-native:do_populate_staging"</screen></para>
+                <para>means the do_populate_staging task of the target quilt-native must have completed before the do_patch can execute.</para>
+            </section>
+        </section>
+
+        <section>
+            <title>Parsing</title>
+            <section>
+                <title>Configuration Files</title>
+                <para>The first of the classifications of metadata in BitBake is configuration metadata.  This metadata is global, and therefore affects <emphasis>all</emphasis> packages and tasks which are executed.  Currently, BitBake has hardcoded knowledge of a single configuration file.  It expects to find 'conf/bitbake.conf' somewhere in the user specified <envar>BBPATH</envar>.  That configuration file generally has include directives to pull in any other metadata (generally files specific to architecture, machine, <emphasis>local</emphasis> and so on.</para>
+                <para>Only variable definitions and include directives are allowed in .conf files.</para>
+            </section>
+            <section>
+                <title>Classes</title>
+                <para>BitBake classes are our rudamentary inheritence mechanism.  As briefly mentioned in the metadata introduction, they're parsed when an <literal>inherit</literal> directive is encountered, and they are located in classes/ relative to the dirs in <envar>BBPATH</envar>.</para>
+            </section>
+            <section>
+                <title>.bb Files</title>
+                <para>A BitBake (.bb) file is a logical unit of tasks to be executed.  Normally this is a package to be built.  Inter-.bb dependencies are obeyed.  The files themselves are located via the <varname>BBFILES</varname> variable, which is set to a space seperated list of .bb files, and does handle wildcards.</para>
+            </section>
+        </section>
+    </chapter>
+
+    <chapter>
+        <title>File Download support</title>
+        <section>
+            <title>Overview</title>
+            <para>BitBake provides support to download files this procedure is called fetching. The SRC_URI is normally used to indicate BitBake which files to fetch. The next sections will describe th available fetchers and the options they have. Each Fetcher honors a set of Variables and
+a per URI parameters separated by a <quote>;</quote> consisting of a key and a value. The semantic of the Variables and Parameters are defined by the Fetcher. BitBakes tries to have a consistent semantic between the different Fetchers.
+            </para>
+        </section>
+
+        <section>
+            <title>Local File Fetcher</title>
+            <para>The URN for the Local File Fetcher is <emphasis>file</emphasis>. The filename can be either absolute or relative. If the filename is relative <varname>FILESPATH</varname> and <varname>FILESDIR</varname> will be used to find the appropriate relative file depending on the <varname>OVERRIDES</varname>. Single files and complete directories can be specified.
+<screen><varname>SRC_URI</varname>= "file://relativefile.patch"
+<varname>SRC_URI</varname>= "file://relativefile.patch;this=ignored"
+<varname>SRC_URI</varname>= "file:///Users/ich/very_important_software"
+</screen>
+            </para>
+        </section>
+
+        <section>
+            <title>CVS File Fetcher</title>
+            <para>The URN for the CVS Fetcher is <emphasis>cvs</emphasis>. This Fetcher honors the variables <varname>DL_DIR</varname>, <varname>SRCDATE</varname>, <varname>FETCHCOMMAND_cvs</varname>, <varname>UPDATECOMMAND_cvs</varname>. <varname>DL_DIRS</varname> specifies where a temporary checkout is saved, <varname>SRCDATE</varname> specifies which date to use when doing the fetching (the special value of "now" will cause the checkout to be updated on every build), <varname>FETCHCOMMAND</varname> and <varname>UPDATECOMMAND</varname> specify which executables should be used when doing the CVS checkout or update.
+            </para>
+            <para>The supported Parameters are <varname>module</varname>, <varname>tag</varname>, <varname>date</varname>, <varname>method</varname>, <varname>localdir</varname>, <varname>rsh</varname>. The <varname>module</varname> specifies which module to check out, the <varname>tag</varname> describes which CVS TAG should be used for the checkout by default the TAG is empty. A <varname>date</varname> can be specified to override the SRCDATE of the configuration to checkout a specific date.  The special value of "now" will cause the checkout to be updated on every build.<varname>method</varname> is by default <emphasis>pserver</emphasis>, if <emphasis>ext</emphasis> is used the <varname>rsh</varname> parameter will be evaluated and <varname>CVS_RSH</varname> will be set. Finally <varname>localdir</varname> is used to checkout into a special directory relative to <varname>CVSDIR></varname>.
+<screen><varname>SRC_URI</varname> = "cvs://CVSROOT;module=mymodule;tag=some-version;method=ext"
+<varname>SRC_URI</varname> = "cvs://CVSROOT;module=mymodule;date=20060126;localdir=usethat"
+</screen>
+            </para>
+        </section>
+
+        <section>
+            <title>HTTP/FTP Fetcher</title>
+            <para>The URNs for the HTTP/FTP are <emphasis>http</emphasis>, <emphasis>https</emphasis> and <emphasis>ftp</emphasis>. This Fetcher honors the variables <varname>DL_DIR</varname>, <varname>FETCHCOMMAND_wget</varname>, <varname>PREMIRRORS</varname>, <varname>MIRRORS</varname>. The <varname>DL_DIR</varname> defines where to store the fetched file, <varname>FETCHCOMMAND</varname> contains the command used for fetching. <quote>${URI}</quote> and <quote>${FILES}</quote> will be replaced by the uri and basename of the to be fetched file. <varname>PREMIRRORS</varname>
+will be tried first when fetching a file if that fails the actual file will be tried and finally all <varname>MIRRORS</varname> will be tried.
+            </para>
+            <para>The only supported Parameter is <varname>md5sum</varname>. After a fetch the <varname>md5sum</varname> of the file will be calculated and the two sums will be compared.
+            </para>
+            <para><screen><varname>SRC_URI</varname> = "http://oe.handhelds.org/not_there.aac;md5sum=12343"
+<varname>SRC_URI</varname> = "ftp://oe.handhelds.org/not_there_as_well.aac;md5sum=1234"
+<varname>SRC_URI</varname> = "ftp://you@oe.handheld.sorg/home/you/secret.plan;md5sum=1234"
+</screen></para>
+        </section>
+
+        <section>
+            <title>SVK Fetcher</title>
+            <para>
+            <emphasis>Currently NOT supported</emphasis>
+            </para>
+        </section>
+
+        <section>
+            <title>SVN Fetcher</title>
+            <para>The URN for the SVN Fetcher is <emphasis>svn</emphasis>.
+            </para>
+            <para>This Fetcher honors the variables <varname>FETCHCOMMAND_svn</varname>, <varname>DL_DIR</varname>, <varname>SRCDATE</varname>. <varname>FETCHCOMMAND</varname> contains the subversion command, <varname>DL_DIR</varname> is the directory where tarballs will be saved, <varname>SRCDATE</varname> specifies which date to use when doing the fetching (the special value of "now" will cause the checkout to be updated on every build).
+            </para>
+            <para>The supported Parameters are <varname>proto</varname>, <varname>rev</varname>. <varname>proto</varname> is the subversion prototype, <varname>rev</varname> is the subversions revision.
+            </para>
+            <para><screen><varname>SRC_URI</varname> = "svn://svn.oe.handhelds.org/svn;module=vip;proto=http;rev=667"
+<varname>SRC_URI</varname> = "svn://svn.oe.handhelds.org/svn/;module=opie;proto=svn+ssh;date=20060126"
+</screen></para>
+        </section>
+
+        <section>
+            <title>GIT Fetcher</title>
+            <para>The URN for the GIT Fetcher is <emphasis>git</emphasis>.
+            </para>
+            <para>The Variables <varname>DL_DIR</varname>, <varname>GITDIR</varname> are used. <varname>DL_DIR</varname> will be used to store the checkedout version. <varname>GITDIR</varname> will be used as the base directory where the git tree is cloned to.
+            </para>
+            <para>The Parameters are <emphasis>tag</emphasis>, <emphasis>protocol</emphasis>. <emphasis>tag</emphasis> is a git tag, the default is <quote>master</quote>. <emphasis>protocol</emphasis> is the git protocol to use and defaults to <quote>rsync</quote>.
+            </para>
+            <para><screen><varname>SRC_URI</varname> = "git://git.oe.handhelds.org/git/vip.git;tag=version-1"
+<varname>SRC_URI</varname> = "git://git.oe.handhelds.org/git/vip.git;protocol=http"
+            </screen></para>
+        </section>
+
+    </chapter>
+
+
+    <chapter>
+        <title>Commands</title>
+        <section>
+            <title>bbread</title>
+            <para>bbread is a command for displaying BitBake metadata.  When run with no arguments, it has the core parse 'conf/bitbake.conf', as located in BBPATH, and displays that.  If you supply a file on the commandline, such as a .bb, then it parses that afterwards, using the aforementioned configuration metadata.</para>
+        <para><emphasis>NOTE: the stand a lone bbread command was removed. Instead of bbread use bitbake -e.
+        </emphasis></para>
+        </section>
+        <section>
+            <title>bitbake</title>
+            <section>
+                <title>Introduction</title>
+                <para>bitbake is the primary command in the system.  It facilitates executing tasks in a single .bb file, or executing a given task on a set of multiple .bb files, accounting for interdependencies amongst them.</para>
+            </section>
+            <section>
+                <title>Usage and Syntax</title>
+                <para>
+                    <screen><prompt>$ </prompt>bitbake --help
+usage: bitbake [options] [package ...]
+
+Executes the specified task (default is 'build') for a given set of BitBake files.
+It expects that BBFILES is defined, which is a space seperated list of files to
+be executed.  BBFILES does support wildcards.
+Default BBFILES are the .bb files in the current directory.
+
+options:
+  --version             show program's version number and exit
+  -h, --help            show this help message and exit
+  -b BUILDFILE, --buildfile=BUILDFILE
+                        execute the task against this .bb file, rather than a
+                        package from BBFILES.
+  -k, --continue        continue as much as possible after an error. While the
+                        target that failed, and those that depend on it,
+                        cannot be remade, the other dependencies of these
+                        targets can be processed all the same.
+  -f, --force           force run of specified cmd, regardless of stamp status
+  -i, --interactive     drop into the interactive mode also called the BitBake
+                        shell.
+  -c CMD, --cmd=CMD     Specify task to execute. Note that this only executes
+                        the specified task for the providee and the packages
+                        it depends on, i.e. 'compile' does not implicitly call
+                        stage for the dependencies (IOW: use only if you know
+                        what you are doing). Depending on the base.bbclass a
+                        listtasks tasks is defined and will show available
+                        tasks
+  -r FILE, --read=FILE  read the specified file before bitbake.conf
+  -v, --verbose         output more chit-chat to the terminal
+  -D, --debug           Increase the debug level. You can specify this more
+                        than once.
+  -n, --dry-run         don't execute, just go through the motions
+  -p, --parse-only      quit after parsing the BB files (developers only)
+  -d, --disable-psyco   disable using the psyco just-in-time compiler (not
+                        recommended)
+  -s, --show-versions   show current and preferred versions of all packages
+  -e, --environment     show the global or per-package environment (this is
+                        what used to be bbread)
+  -g, --graphviz        emit the dependency trees of the specified packages in
+                        the dot syntax
+  -I IGNORED_DOT_DEPS, --ignore-deps=IGNORED_DOT_DEPS
+                        Stop processing at the given list of dependencies when
+                        generating dependency graphs. This can help to make
+                        the graph more appealing
+  -l DEBUG_DOMAINS, --log-domains=DEBUG_DOMAINS
+                        Show debug logging for the specified logging domains
+
+</screen>
+                </para>
+                <para>
+                <example>
+                    <title>Executing a task against a single .bb</title>
+                    <para>Executing tasks for a single file is relatively simple.  You specify the file in question, and bitbake parses it and executes the specified task (or <quote>build</quote> by default).  It obeys intertask dependencies when doing so.</para>
+                    <para><quote>clean</quote> task:</para>
+                    <para><screen><prompt>$ </prompt>bitbake -b blah_1.0.bb -c clean</screen></para>
+                    <para><quote>build</quote> task:</para>
+                    <para><screen><prompt>$ </prompt>bitbake -b blah_1.0.bb</screen></para>
+                </example>
+                </para>
+                <para>
+                <example>
+                    <title>Executing tasks against a set of .bb files</title>
+                    <para>There are a number of additional complexities introduced when one wants to manage multiple .bb files.  Clearly there needs to be a way to tell bitbake what files are available, and of those, which we want to execute at this time.  There also needs to be a way for each .bb to express its dependencies, both for build time and runtime.  There must be a way for the user to express their preferences when multiple .bb's provide the same functionality, or when there are multiple versions of a .bb.</para>
+                    <para>The next section, Metadata, outlines how one goes about specifying such things.</para>
+                    <para>Note that the bitbake command, when not using --buildfile, accepts a <varname>PROVIDER</varname>, not a filename or anything else.  By default, a .bb generally PROVIDES its packagename, packagename-version, and packagename-version-revision.</para>
+                    <screen><prompt>$ </prompt>bitbake blah</screen>
+                    <screen><prompt>$ </prompt>bitbake blah-1.0</screen>
+                    <screen><prompt>$ </prompt>bitbake blah-1.0-r0</screen>
+                    <screen><prompt>$ </prompt>bitbake -c clean blah</screen>
+                    <screen><prompt>$ </prompt>bitbake virtual/whatever</screen>
+                    <screen><prompt>$ </prompt>bitbake -c clean virtual/whatever</screen>
+                </example>
+                <example>
+                    <title>Generating dependency graphs</title>
+                    <para>BitBake is able to generate dependency graphs using the dot syntax. These graphs can be converted
+to images using the <application>dot</application> application from <ulink url="http://www.graphviz.org">graphviz</ulink>. 
+Two files will be written into the current working directory, <emphasis>depends.dot</emphasis> containing dependency information at the package level and <emphasis>task-depends.dot</emphasis> containing a breakdown of the dependencies at the task level. To stop depending on common depends one can use the <prompt>-I depend</prompt> to omit these from the graph. This can lead to more readable graphs. E.g. this way <varname>DEPENDS</varname> from inherited classes, e.g. base.bbclass, can be removed from the graph.</para>
+                    <screen><prompt>$ </prompt>bitbake -g blah</screen>
+                    <screen><prompt>$ </prompt>bitbake -g -I virtual/whatever -I bloom blah</screen>
+                </example>
+                </para>
+            </section>
+            <section>
+                <title>Special variables</title>
+                <para>Certain variables affect bitbake operation:</para>
+                <section>
+                    <title><varname>BB_NUMBER_THREADS</varname></title>
+                    <para> The number of threads bitbake should run at once (default: 1).</para>
+                </section>
+            </section>
+            <section>
+                <title>Metadata</title>
+                <para>As you may have seen in the usage information, or in the information about .bb files, the BBFILES variable is how the bitbake tool locates its files.  This variable is a space seperated list of files that are available, and supports wildcards.
+                <example>
+                    <title>Setting BBFILES</title>
+                    <programlisting><varname>BBFILES</varname> = "/path/to/bbfiles/*.bb"</programlisting>
+                </example></para>
+                <para>With regard to dependencies, it expects the .bb to define a <varname>DEPENDS</varname> variable, which contains a space seperated list of <quote>package names</quote>, which themselves are the <varname>PN</varname> variable.  The <varname>PN</varname> variable is, in general, by default, set to a component of the .bb filename.</para>
+                <example>
+                    <title>Depending on another .bb</title>
+                    <para>a.bb:
+    <screen>PN = "package-a"
+DEPENDS += "package-b"</screen>
+                    </para>
+                    <para>b.bb:
+    <screen>PN = "package-b"</screen>
+                    </para>
+                </example>
+                <example>
+                    <title>Using PROVIDES</title>
+                    <para>This example shows the usage of the PROVIDES variable, which allows a given .bb to specify what functionality it provides.</para>
+                    <para>package1.bb:
+    <screen>PROVIDES += "virtual/package"</screen>
+                    </para>
+                    <para>package2.bb:
+    <screen>DEPENDS += "virtual/package"</screen>
+                    </para>
+                    <para>package3.bb:
+    <screen>PROVIDES += "virtual/package"</screen>
+                    </para>
+                    <para>As you can see, here there are two different .bb's that provide the same functionality (virtual/package).  Clearly, there needs to be a way for the person running bitbake to control which of those providers gets used.  There is, indeed, such a way.</para>
+                    <para>The following would go into a .conf file, to select package1:
+    <screen>PREFERRED_PROVIDER_virtual/package = "package1"</screen>
+                    </para>
+                </example>
+                <example>
+                    <title>Specifying version preference</title>
+                    <para>When there are multiple <quote>versions</quote> of a given package, bitbake defaults to selecting the most recent version, unless otherwise specified.  If the .bb in question has a <varname>DEFAULT_PREFERENCE</varname> set lower than the other .bb's (default is 0), then it will not be selected.  This allows the person or persons maintaining the repository of .bb files to specify their preferences for the default selected version.  In addition, the user can specify their preferences with regard to version.</para>
+                    <para>If the first .bb is named <filename>a_1.1.bb</filename>, then the <varname>PN</varname> variable will be set to <quote>a</quote>, and the <varname>PV</varname> variable will be set to 1.1.</para>
+                    <para>If we then have an <filename>a_1.2.bb</filename>, bitbake will choose 1.2 by default.  However, if we define the following variable in a .conf that bitbake parses, we can change that.
+    <screen>PREFERRED_VERSION_a = "1.1"</screen>
+                    </para>
+                </example>
+                <example>
+                    <title>Using <quote>bbfile collections</quote></title>
+                    <para>bbfile collections exist to allow the user to have multiple repositories of bbfiles that contain the same exact package.  For example, one could easily use them to make one's own local copy of an upstream repository, but with custom modifications that one does not want upstream.  Usage:</para>
+                    <screen>BBFILES = "/stuff/openembedded/*/*.bb /stuff/openembedded.modified/*/*.bb"
+BBFILE_COLLECTIONS = "upstream local"
+BBFILE_PATTERN_upstream = "^/stuff/openembedded/"
+BBFILE_PATTERN_local = "^/stuff/openembedded.modified/"
+BBFILE_PRIORITY_upstream = "5"
+BBFILE_PRIORITY_local = "10"</screen>
+                </example>
+            </section>
+        </section>
+    </chapter>
+</book>

bitbake/doc/poky.ent

@@ -1,59 +0,0 @@
-<!ENTITY DISTRO "1.4">
-<!ENTITY DISTRO_NAME "tbd">
-<!ENTITY YOCTO_DOC_VERSION "1.4">
-<!ENTITY POKYVERSION "8.0">
-<!ENTITY YOCTO_POKY "poky-&DISTRO_NAME;-&POKYVERSION;">
-<!ENTITY COPYRIGHT_YEAR "2010-2013">
-<!ENTITY YOCTO_DL_URL "http://downloads.yoctoproject.org">
-<!ENTITY YOCTO_HOME_URL "http://www.yoctoproject.org">
-<!ENTITY YOCTO_LISTS_URL "http://lists.yoctoproject.org">
-<!ENTITY YOCTO_BUGZILLA_URL "http://bugzilla.yoctoproject.org">
-<!ENTITY YOCTO_WIKI_URL "https://wiki.yoctoproject.org">
-<!ENTITY YOCTO_AB_URL "http://autobuilder.yoctoproject.org">
-<!ENTITY YOCTO_GIT_URL "http://git.yoctoproject.org">
-<!ENTITY YOCTO_ADTREPO_URL "http://adtrepo.yoctoproject.org">
-<!ENTITY OE_HOME_URL "http://www.openembedded.org">
-<!ENTITY OE_LISTS_URL "http://lists.linuxtogo.org/cgi-bin/mailman">
-<!ENTITY OE_DOCS_URL "http://docs.openembedded.org">
-<!ENTITY OH_HOME_URL "http://o-hand.com">
-<!ENTITY BITBAKE_HOME_URL "http://developer.berlios.de/projects/bitbake/">
-<!ENTITY ECLIPSE_MAIN_URL "http://www.eclipse.org/downloads">
-<!ENTITY ECLIPSE_DL_URL "http://download.eclipse.org">
-<!ENTITY ECLIPSE_DL_PLUGIN_URL "&YOCTO_DL_URL;/releases/eclipse-plugin/&DISTRO;">
-<!ENTITY ECLIPSE_UPDATES_URL "&ECLIPSE_DL_URL;/tm/updates/3.3">
-<!ENTITY ECLIPSE_INDIGO_URL "&ECLIPSE_DL_URL;/releases/indigo">
-<!ENTITY ECLIPSE_JUNO_URL "&ECLIPSE_DL_URL;/releases/juno">
-<!ENTITY ECLIPSE_INDIGO_CDT_URL "&ECLIPSE_DL_URL;tools/cdt/releases/indigo">
-<!ENTITY YOCTO_DOCS_URL "&YOCTO_HOME_URL;/docs">
-<!ENTITY YOCTO_SOURCES_URL "&YOCTO_HOME_URL;/sources/">
-<!ENTITY YOCTO_AB_PORT_URL "&YOCTO_AB_URL;:8010">
-<!ENTITY YOCTO_AB_NIGHTLY_URL "&YOCTO_AB_URL;/nightly/">
-<!ENTITY YOCTO_POKY_URL "&YOCTO_DL_URL;/releases/poky/">
-<!ENTITY YOCTO_RELEASE_DL_URL "&YOCTO_DL_URL;/releases/yocto/yocto-&DISTRO;">
-<!ENTITY YOCTO_TOOLCHAIN_DL_URL "&YOCTO_RELEASE_DL_URL;/toolchain/">
-<!ENTITY YOCTO_ECLIPSE_DL_URL "&YOCTO_RELEASE_DL_URL;/eclipse-plugin/indigo;">
-<!ENTITY YOCTO_ADTINSTALLER_DL_URL "&YOCTO_RELEASE_DL_URL;/adt_installer">
-<!ENTITY YOCTO_POKY_DL_URL "&YOCTO_RELEASE_DL_URL;/&YOCTO_POKY;.tar.bz2">
-<!ENTITY YOCTO_MACHINES_DL_URL "&YOCTO_RELEASE_DL_URL;/machines">
-<!ENTITY YOCTO_QEMU_DL_URL "&YOCTO_MACHINES_DL_URL;/qemu">
-<!ENTITY YOCTO_PYTHON-i686_DL_URL "&YOCTO_DL_URL;/releases/miscsupport/python-nativesdk-standalone-i686.tar.bz2">
-<!ENTITY YOCTO_PYTHON-x86_64_DL_URL "&YOCTO_DL_URL;/releases/miscsupport/python-nativesdk-standalone-x86_64.tar.bz2">
-<!ENTITY YOCTO_DOCS_QS_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/yocto-project-qs/yocto-project-qs.html">
-<!ENTITY YOCTO_DOCS_ADT_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/adt-manual/adt-manual.html">
-<!ENTITY YOCTO_DOCS_REF_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/ref-manual/ref-manual.html">
-<!ENTITY YOCTO_DOCS_BSP_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/bsp-guide/bsp-guide.html">
-<!ENTITY YOCTO_DOCS_DEV_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/dev-manual/dev-manual.html">
-<!ENTITY YOCTO_DOCS_KERNEL_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/kernel-manual/kernel-manual.html">
-<!ENTITY YOCTO_ADTPATH_DIR "/opt/poky/&DISTRO;">
-<!ENTITY YOCTO_POKY_TARBALL "&YOCTO_POKY;.tar.bz2">
-<!ENTITY OE_INIT_PATH "&YOCTO_POKY;/oe-init-build-env">
-<!ENTITY OE_INIT_FILE "oe-init-build-env">
-<!ENTITY UBUNTU_HOST_PACKAGES_ESSENTIAL "gawk wget git-core diffstat unzip texinfo \
-     build-essential chrpath">
-<!ENTITY FEDORA_HOST_PACKAGES_ESSENTIAL "gawk make wget tar bzip2 gzip python unzip perl patch \
-     diffutils diffstat git cpp gcc gcc-c++ eglibc-devel texinfo chrpath \
-     ccache">
-<!ENTITY OPENSUSE_HOST_PACKAGES_ESSENTIAL "python gcc gcc-c++ git chrpath make wget python-xml \
-     diffstat texinfo python-curses">
-<!ENTITY CENTOS_HOST_PACKAGES_ESSENTIAL "gawk make wget tar bzip2 gzip python unzip perl patch \
-     diffutils diffstat git cpp gcc gcc-c++ glibc-devel texinfo chrpath">

bitbake/doc/template/db-pdf.xsl

@@ -1,64 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
-  
-  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl" />
-
-  <!-- check project-plan.sh for how this is generated, needed to tweak 
-       the cover page     
-    -->
-  <xsl:include href="/tmp/titlepage.xsl"/> 
-
-  <!-- To force a page break in document, i.e per section add a 
-      <?hard-pagebreak?> tag.
-  -->
- <xsl:template match="processing-instruction('hard-pagebreak')">
-   <fo:block break-before='page' />
- </xsl:template>
-
-  <!--Fix for defualt indent getting TOC all wierd..
-      See http://sources.redhat.com/ml/docbook-apps/2005-q1/msg00455.html 
-      FIXME: must be a better fix
-    -->
-  <xsl:param name="body.start.indent" select="'0'"/>
-  <!--<xsl:param name="title.margin.left" select="'0'"/>-->
-
-  <!-- stop long-ish header titles getting wrapped -->
-  <xsl:param name="header.column.widths">1 10 1</xsl:param>
-
-  <!-- customise headers and footers a little --> 
-
-  <xsl:template name="head.sep.rule">
-   <xsl:if test="$header.rule != 0">
-     <xsl:attribute name="border-bottom-width">0.5pt</xsl:attribute>
-     <xsl:attribute name="border-bottom-style">solid</xsl:attribute>
-     <xsl:attribute name="border-bottom-color">#cccccc</xsl:attribute>
-   </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="foot.sep.rule">
-    <xsl:if test="$footer.rule != 0">
-     <xsl:attribute name="border-top-width">0.5pt</xsl:attribute>
-     <xsl:attribute name="border-top-style">solid</xsl:attribute>
-     <xsl:attribute name="border-top-color">#cccccc</xsl:attribute>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:attribute-set name="header.content.properties">
-    <xsl:attribute name="color">#cccccc</xsl:attribute>
-  </xsl:attribute-set>
-
-  <xsl:attribute-set name="footer.content.properties">
-    <xsl:attribute name="color">#cccccc</xsl:attribute>
-  </xsl:attribute-set>
-
- 
-  <!-- general settings -->
-
-  <xsl:param name="fop1.extensions" select="1"></xsl:param>
-  <xsl:param name="paper.type" select="'A4'"></xsl:param>
-  <xsl:param name="section.autolabel" select="1"></xsl:param>
-  <xsl:param name="body.font.family" select="'verasans'"></xsl:param>
-  <xsl:param name="title.font.family" select="'verasans'"></xsl:param>
-  <xsl:param name="monospace.font.family" select="'veramono'"></xsl:param>
-
-</xsl:stylesheet>

bitbake/doc/template/fop-config.xml

@@ -1,58 +0,0 @@
-<fop version="1.0">
-
-  <!-- Strict user configuration -->
-  <strict-configuration>true</strict-configuration>
-
-  <!-- Strict FO validation -->
-  <strict-validation>true</strict-validation>
-
-   <!--
-    Set the baseDir so common/openedhand.svg references in plans still
-    work ok. Note, relative file references to current dir should still work.
-    -->	
-  <base>../template</base>
-  <font-base>../template</font-base>
- 
-  <!-- Source resolution in dpi (dots/pixels per inch) for determining the
-       size of pixels in SVG and bitmap images, default: 72dpi -->
-  <!-- <source-resolution>72</source-resolution> -->
-  <!-- Target resolution in dpi (dots/pixels per inch) for specifying the
-       target resolution for generated bitmaps, default: 72dpi -->
-  <!-- <target-resolution>72</target-resolution> -->
- 
-  <!-- default page-height and page-width, in case
-       value is specified as auto -->
-  <default-page-settings height="11in" width="8.26in"/> 
- 
-  <!-- <use-cache>false</use-cache> -->
- 
-  <renderers>
-    <renderer mime="application/pdf">
-      <fonts>
-        <font  metrics-file="VeraMono.xml"
-               kerning="yes" 
-               embed-url="VeraMono.ttf">
-          <font-triplet name="veramono" style="normal" weight="normal"/>
-        </font>
-
-        <font  metrics-file="VeraMoBd.xml"
-               kerning="yes" 
-               embed-url="VeraMoBd.ttf">
-          <font-triplet name="veramono" style="normal" weight="bold"/>
-        </font>
-
-        <font  metrics-file="Vera.xml"
-               kerning="yes" 
-               embed-url="Vera.ttf">
-          <font-triplet name="verasans" style="normal" weight="normal"/>
-          <font-triplet name="verasans" style="normal" weight="bold"/>
-          <font-triplet name="verasans" style="italic" weight="normal"/>
-          <font-triplet name="verasans" style="italic" weight="bold"/>
-        </font>
-        
-        <auto-detect/>
-      </fonts>
-    </renderer>
-  </renderers>
-</fop>
-

bitbake/doc/tools/docbook-to-pdf

@@ -1,51 +0,0 @@
-#!/bin/sh
-	
-if [ -z "$1" -o -z "$2" ]; then
-   echo "usage: [-v] $0 <docbook file> <templatedir>"
-   echo
-   echo "*NOTE* you need xsltproc, fop and nwalsh docbook stylesheets" 
-   echo "       installed for this to work!"
-   echo
-   exit 0
-fi
-
-FO=`echo $1 | sed s/.xml/.fo/` || exit 1
-PDF=`echo $1 | sed s/.xml/.pdf/` || exit 1
-TEMPLATEDIR=$2
-
-##
-# These URI should be rewritten by your distribution's xml catalog to
-# match your localy installed XSL stylesheets.
-XSL_BASE_URI="http://docbook.sourceforge.net/release/xsl/current"
-
-# Creates a temporary XSL stylesheet based on titlepage.xsl
-xsltproc -o /tmp/titlepage.xsl                                           \
-	 --xinclude                                                      \
-         $XSL_BASE_URI/template/titlepage.xsl \
-         $TEMPLATEDIR/titlepage.templates.xml || exit 1
-
-# Creates the file needed for FOP
-xsltproc --xinclude                    \
-	 --stringparam hyphenate false \
-	 --stringparam formal.title.placement "figure after" \
-	 --stringparam ulink.show 1 \
-         --stringparam  body.font.master  9 \
-         --stringparam  title.font.master  11 \
-         --stringparam draft.watermark.image "$TEMPLATEDIR/draft.png" \
-         --stringparam  chapter.autolabel 1 \
-         --stringparam  appendix.autolabel A \
-         --stringparam  section.autolabel 1 \
-         --stringparam  section.label.includes.component.label 1 \
-         --output $FO               \
-         $TEMPLATEDIR/db-pdf.xsl    \
-	 $1                 || exit 1
-
-# Invokes the Java version of FOP.  Uses the additional configuration file common/fop-config.xml
-fop -c $TEMPLATEDIR/fop-config.xml -fo $FO -pdf $PDF       || exit 1
-
-rm -f $FO
-rm -f  /tmp/titlepage.xsl
-
-echo
-echo " #### Success! $PDF ready. ####"
-echo

bitbake/doc/user-manual/user-manual-bitbakecommand.xml

@@ -1,367 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<chapter>
-    <title>The BitBake Command</title>
-
-    <section id='bitbake-command-introduction'>
-        <title>Introduction</title>
-
-        <para>
-            Bitbake is the primary command in the system.
-            It facilitates executing tasks in a single <filename>.bb</filename>
-            file, or executing a given task on a set of multiple
-            <filename>.bb</filename> files, accounting for interdependencies
-            amongst them.
-        </para>
-    </section>
-
-    <section id='usage-and-syntax'>
-        <title>Usage and syntax</title>
-
-        <para>
-            Following is the usage and syntax for BitBake:
-            <literallayout class='monospaced'>
-     $ bitbake -h
-Usage: bitbake [options] [recipename/target ...]
-
-    Executes the specified task (default is 'build') for a given set of target recipes (.bb files).
-    It is assumed there is a conf/bblayers.conf available in cwd or in BBPATH which
-    will provide the layer, BBFILES and other configuration information.
-
-Options:
-  --version             show program's version number and exit
-  -h, --help            show this help message and exit
-  -b BUILDFILE, --buildfile=BUILDFILE
-                        Execute tasks from a specific .bb recipe directly.
-                        WARNING: Does not handle any dependencies from other
-                        recipes.
-  -k, --continue        Continue as much as possible after an error. While the
-                        target that failed and anything depending on it cannot
-                        be built, as much as possible will be built before
-                        stopping.
-  -a, --tryaltconfigs   Continue with builds by trying to use alternative
-                        providers where possible.
-  -f, --force           Force the specified targets/task to run (invalidating
-                        any existing stamp file).
-  -c CMD, --cmd=CMD     Specify the task to execute. The exact options
-                        available depend on the metadata. Some examples might
-                        be 'compile' or 'populate_sysroot' or 'listtasks' may
-                        give a list of the tasks available.
-  -C INVALIDATE_STAMP, --clear-stamp=INVALIDATE_STAMP
-                        Invalidate the stamp for the specified task such as
-                        'compile' and then run the default task for the
-                        specified target(s).
-  -r PREFILE, --read=PREFILE
-                        Read the specified file before bitbake.conf.
-  -R POSTFILE, --postread=POSTFILE
-                        Read the specified file after bitbake.conf.
-  -v, --verbose         Output more log message data to the terminal.
-  -D, --debug           Increase the debug level. You can specify this more
-                        than once.
-  -n, --dry-run         Don't execute, just go through the motions.
-  -S, --dump-signatures
-                        Don't execute, just dump out the signature
-                        construction information.
-  -p, --parse-only      Quit after parsing the BB recipes.
-  -s, --show-versions   Show current and preferred versions of all recipes.
-  -e, --environment     Show the global or per-package environment complete
-                        with information about where variables were
-                        set/changed.
-  -g, --graphviz        Save dependency tree information for the specified
-                        targets in the dot syntax.
-  -I EXTRA_ASSUME_PROVIDED, --ignore-deps=EXTRA_ASSUME_PROVIDED
-                        Assume these dependencies don't exist and are already
-                        provided (equivalent to ASSUME_PROVIDED). Useful to
-                        make dependency graphs more appealing
-  -l DEBUG_DOMAINS, --log-domains=DEBUG_DOMAINS
-                        Show debug logging for the specified logging domains
-  -P, --profile         Profile the command and save reports.
-  -u UI, --ui=UI        The user interface to use (e.g. knotty, hob, depexp).
-  -t SERVERTYPE, --servertype=SERVERTYPE
-                        Choose which server to use, process or xmlrpc.
-  --revisions-changed   Set the exit code depending on whether upstream
-                        floating revisions have changed or not.
-  --server-only         Run bitbake without a UI, only starting a server
-                        (cooker) process.
-  -B BIND, --bind=BIND  The name/address for the bitbake server to bind to.
-  --no-setscene         Do not run any setscene tasks. sstate will be ignored
-                        and everything needed, built.
-  --remote-server=REMOTE_SERVER
-                        Connect to the specified server.
-  -m, --kill-server     Terminate the remote server.
-  --observe-only        Connect to a server as an observing-only client.
-  --status-only         Check the status of the remote bitbake server.
-
-            </literallayout>
-        </para>
-    </section>
-
-    <section id='bitbake-examples'>
-        <title>Examples</title>
-
-        <para>
-            This section presents some examples showing how to use BitBake.
-        </para>
-
-        <section id='example-executing-a-task-against-a-single-recipe'>
-            <title>Executing a Task Against a Single Recipe</title>
-
-            <para>
-                Executing tasks for a single recipe file is relatively simple.
-                You specify the file in question, and BitBake parses
-                it and executes the specified task (or “build” by default).
-                BitBake obeys inter-task dependencies when doing
-                so.
-            </para>
-
-            <para>
-                The following command runs the clean task on the
-                <filename>foo_1.0.bb</filename> recipe file:
-                <literallayout class='monospaced'>
-     $ bitbake -b foo.bb -c clean
-                </literallayout>
-                The following command runs the build task, which is
-                the default task, on the <filename>foo_1.0.bb</filename>
-                recipe file:
-                <literallayout class='monospaced'>
-     $ bitbake -b foo_1.0.bb
-                </literallayout>
-            </para>
-        </section>
-
-        <section id='executing-tasks-against-a-set-of-recipe-files'>
-            <title>Executing Tasks Against a Set of Recipe Files</title>
-
-            <para>
-                There are a number of additional complexities introduced
-                when one wants to manage multiple <filename>.bb</filename>
-                files.
-                Clearly there needs to be a way to tell BitBake what
-                files are available, and of those, which we
-                want to execute at this time.
-                There also needs to be a way for each <filename>.bb</filename>
-                to express its dependencies, both for build-time and
-                runtime.
-                There must be a way for the user to express their preferences
-                when multiple recipes provide the same functionality, or when
-                there are multiple versions of a  <filename>.bb</filename> file.
-            </para>
-
-            <para>
-                The next section, Metadata, outlines how to specify such things.
-            </para>
-
-            <para>
-                The <filename>bitbake</filename> command, when not using
-                "--buildfile", accepts a PROVIDER, not a filename or
-                anything else.
-                By default, a <filename>.bb</filename> generally PROVIDES its
-                packagename, packagename-version, and packagename-version-revision.
-                <literallayout class='monospaced'>
-     $ bitbake foo
-
-     $ bitbake foo-1.0
-
-     $ bitbake foo-1.0-r0
-
-     $ bitbake -c clean foo
-
-     $ bitbake virtual/whatever
-
-     $ bitbake -c clean virtual/whatever
-                </literallayout>
-            </para>
-        </section>
-
-        <section id='generating-dependency-graphs'>
-            <title>Generating Dependency Graphs</title>
-
-            <para>
-                BitBake is able to generate dependency graphs using
-                the dot syntax.
-                These graphs can be converted to images using the dot
-                application from
-                <ulink url='http://www.graphviz.org'>Graphviz</ulink>.
-                Two files will be written into the current working directory:
-                <filename>depends.dot</filename> containing dependency information
-                at the package level and <filename>task-depends.dot</filename>
-                containing a breakdown of the dependencies at the task level.
-                To stop depending on common depends, one can use the "-I" depend
-                option to omit these from the graph.
-                This can lead to more readable graphs.
-                This way, <filename>DEPENDS</filename> from inherited classes
-                such as <filename>base.bbclass</filename> can be removed from the
-                graph.
-                <literallayout class='monospaced'>
-     $ bitbake -g foo
-
-     $ bitbake -g -I virtual/whatever -I bloom foo
-                </literallayout>
-            </para>
-        </section>
-    </section>
-
-    <section id='special-variables'>
-        <title>Special Variables</title>
-
-        <para>
-            Certain variables affect BitBake operation:
-        </para>
-
-        <section id='bb-number-threads'>
-            <title><filename>BB_NUMBER_THREADS</filename></title>
-
-            <para>
-                The number of threads BitBake should run at once (default: 1).
-            </para>
-        </section>
-    </section>
-
-    <section id='bitbake-command-metadata'>
-        <title>Metadata</title>
-
-        <para>
-            As you may have seen in the usage information, or in the
-            information about <filename>.bb</filename> files, the
-            <filename>BBFILES</filename> variable is how the BitBake
-            tool locates its files.
-            This variable is a space-separated list of files
-            that are available, and supports wildcards.
-        </para>
-
-        <section id='setting-bbfiles'>
-            <title>Setting <filename>BBFILES</filename></title>
-
-            <para>
-                <literallayout class='monospaced'>
-     BBFILES = "/path/to/bbfiles/*.bb"
-                </literallayout>
-                With regard to dependencies, it expects the
-                <filename>.bb</filename> to define a
-                <filename>DEPENDS</filename> variable, which contains a
-                space separated list of “package names”, which themselves
-                are the <filename>PN</filename> variable. The
-                <filename>PN</filename> variable is, in general,
-                set to a component of the <filename>.bb</filename>
-                filename by default.
-            </para>
-        </section>
-
-        <section id='depending-on-another-recipe-file'>
-            <title>Depending on Another Recipe File</title>
-
-            <para>
-                <literallayout class='monospaced'>
-     a.bb:
-
-     PN = "package-a"
-     DEPENDS += "package-b"
-
-     b.bb:
-
-     PN = "package-b"
-                </literallayout>
-            </para>
-        </section>
-
-        <section id='using-provides'>
-            <title>Using <filename>PROVIDES</filename></title>
-
-            <para>
-                This example shows the usage of the
-                <filename>PROVIDES</filename> variable, which allows a
-                given <filename>.bb</filename> to specify what
-                functionality it provides.
-                <literallayout class='monospaced'>
-     package1.bb:
-
-     PROVIDES += "virtual/package"
-
-     package2.bb:
-
-     DEPENDS += "virtual/package"
-
-     package3.bb:
-
-     PROVIDES += "virtual/package"
-                </literallayout>
-                As you can see, we have two different
-                recipes that provide the same functionality
-                (virtual/package).
-                Clearly, there needs to be a way for the person running
-                BitBake to control which of those providers
-                gets used.
-                There is, indeed, such a way.
-            </para>
-
-            <para>
-                The following would go into a <filename>.conf</filename>
-                file, to select package1:
-                <literallayout class='monospaced'>
-     PREFERRED_PROVIDER_virtual/package = "package1"
-                </literallayout>
-            </para>
-        </section>
-
-        <section id='specifying-version-preference'>
-            <title>Specifying Version Preference</title>
-
-            <para>
-                When there are multiple “versions” of a given package,
-                BitBake defaults to selecting the most recent
-                version, unless otherwise specified.
-                If the <filename>.bb</filename> in question has a
-                <filename>DEFAULT_PREFERENCE</filename> set lower than
-                the other recipes (default is 0), then it will not be
-                selected.
-                This allows the person or persons maintaining
-                the repository of <filename>.bb</filename> files to specify
-                their preference for the default selected version.
-                In addition, the user can specify their preferred version.
-            </para>
-
-            <para>
-                If the first <filename>.bb</filename> is named
-                <filename>a_1.1.bb</filename>, then the
-                <filename>PN</filename> variable will be set to
-                “a”, and the <filename>PV</filename> variable will be
-                set to 1.1.
-            </para>
-
-            <para>
-                If we then have an <filename>a_1.2.bb</filename>, BitBake
-                will choose 1.2 by default.
-                However, if we define the following variable in a
-                <filename>.conf</filename> file that BitBake parses, we
-                can change that.
-                <literallayout class='monospaced'>
-     PREFERRED_VERSION_a = "1.1"
-                </literallayout>
-            </para>
-        </section>
-
-        <section id='using-recipe-file-collections'>
-            <title>Using Recipe File Collections</title>
-
-            <para>
-                Recipe file collections exist to allow the user to
-                have multiple repositories of
-                <filename>.bb</filename> files that contain the same
-                exact package.
-                For example, one could easily use them to make one's
-                own local copy of an upstream repository, but with
-                custom modifications that one does not want upstream.
-                Here is an example:
-                <literallayout class='monospaced'>
-    BBFILES = "/stuff/openembedded/*/*.bb /stuff/openembedded.modified/*/*.bb"
-    BBFILE_COLLECTIONS = "upstream local"
-    BBFILE_PATTERN_upstream = "^/stuff/openembedded/"
-    BBFILE_PATTERN_local = "^/stuff/openembedded.modified/"
-    BBFILE_PRIORITY_upstream = "5"
-    BBFILE_PRIORITY_local = "10"
-                </literallayout>
-            </para>
-        </section>
-    </section>
-</chapter>

bitbake/doc/user-manual/user-manual-customization.xsl

@@ -1,14 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
-
-  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" />
-
-  <xsl:param name="html.stylesheet" select="'user-manual-style.css'" />
-  <xsl:param name="chapter.autolabel" select="1" />
-  <xsl:param name="appendix.autolabel" select="A" />
-  <xsl:param name="section.autolabel" select="1" />
-  <xsl:param name="section.label.includes.component.label" select="1" />
-
-<!--  <xsl:param name="generate.toc" select="'article nop'"></xsl:param>  -->
-
-</xsl:stylesheet>

bitbake/doc/user-manual/user-manual-fetching.xml

@@ -1,230 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<chapter>
-<title>File download support</title>
-
-    <section id='file-download-overview'>
-        <title>Overview</title>
-
-        <para>
-            BitBake provides support to download files.
-            This procedure is called fetching and is handled by the
-            fetch and fetch2 modules.
-            At this point, the original fetch code is considered to
-            be replaced by fetch2 and this manual is only related
-            to the fetch2 codebase.
-        </para>
-
-        <para>
-            The <filename>SRC_URI</filename> is normally used to
-            tell BitBake which files to fetch.
-            The next sections describe the available fetchers and
-            their options.
-            Each fetcher honors a set of variables and per
-            URI parameters separated by a “;” consisting of a key and
-            a value.
-            The semantics of the variables and parameters are
-            defined by the fetcher.
-            BitBake tries to have consistent semantics between the
-            different fetchers.
-        </para>
-
-        <para>
-            The overall fetch process first attempts to fetch from
-            <filename>PREMIRRORS</filename>.
-            If these fail, the original <filename>SRC_URI</filename>
-            is attempted.
-            If that fails, BitBake falls back to
-            <filename>MIRRORS</filename>.
-            Because cross-URLs are supported, it is possible to mirror
-            a Git repository on an HTTP server as a tarball.
-            Here are some examples that show commonly used mirror
-            definitions:
-            <literallayout class='monospaced'>
-PREMIRRORS ?= "\
-    bzr://.*/.*   http://somemirror.org/sources/ \n \
-    cvs://.*/.*   http://somemirror.org/sources/ \n \
-    git://.*/.*   http://somemirror.org/sources/ \n \
-    hg://.*/.*    http://somemirror.org/sources/ \n \
-    osc://.*/.*   http://somemirror.org/sources/ \n \
-    p4://.*/.*    http://somemirror.org/sources/ \n \
-    svk://.*/.*   http://somemirror.org/sources/ \n \
-    svn://.*/.*   http://somemirror.org/sources/ \n"
-
-MIRRORS =+ "\
-    ftp://.*/.*      http://somemirror.org/sources/ \n \
-    http://.*/.*     http://somemirror.org/sources/ \n \
-    https://.*/.*    http://somemirror.org/sources/ \n"
-            </literallayout>
-        </para>
-
-        <para>
-            Non-local downloaded output is placed
-            into the directory specified by the
-            <filename>DL_DIR</filename> variable.
-            For non local archive downloads, the code can verify
-            sha256 and md5 checksums for the download to ensure
-            the file has been downloaded correctly.
-            These can be specified in the following forms
-            for md5 and sha256 checksums, respectively:
-            <literallayout class='monospaced'>
-     SRC_URI[md5sum]
-     SRC_URI[sha256sum]
-            </literallayout>
-            You can also specify them as parameters on the
-            <filename>SRC_URI</filename>:
-            <literallayout class='monospaced'>
-     SRC_URI="http://example.com/foobar.tar.bz2;md5sum=4a8e0f237e961fd7785d19d07fdb994d"
-            </literallayout>
-            If <filename>BB_STRICT_CHECKSUM</filename> is set, any download
-            without a checksum will trigger an error message.
-            In cases where multiple files are listed in
-            <filename>SRC_URI</filename>, the name parameter is used
-            assign names to the URLs and these are then specified
-            in the checksums using the following form:
-            <literallayout class='monospaced'>
-     SRC_URI[name.sha256sum]
-            </literallayout>
-        </para>
-    </section>
-
-    <section id='local-file-fetcher'>
-        <title>Local file fetcher</title>
-
-        <para>
-            The URN for the local file fetcher is file.
-            The filename can be either absolute or relative.
-            If the filename is relative,
-            <filename>FILESPATH</filename> and failing that
-            <filename>FILESDIR</filename> will be used to find the
-            appropriate relative file.
-            The metadata usually extend these variables to include
-            variations of the values in <filename>OVERRIDES</filename>.
-            Single files and complete directories can be specified.
-            <literallayout class='monospaced'>
-     SRC_URI = "file://relativefile.patch"
-     SRC_URI = "file://relativefile.patch;this=ignored"
-     SRC_URI = "file:///Users/ich/very_important_software"
-            </literallayout>
-        </para>
-    </section>
-
-    <section id='cvs-fetcher'>
-        <title>CVS fetcher</title>
-
-        <para>
-            The URN for the CVS fetcher is cvs.
-            This fetcher honors the variables <filename>CVSDIR</filename>,
-            <filename>SRCDATE</filename>, <filename>FETCHCOMMAND_cvs</filename>,
-            <filename>UPDATECOMMAND_cvs</filename>.
-            <filename>DL_DIR</filename> specifies where a
-            temporary checkout is saved.
-            <filename>SRCDATE</filename> specifies which date to
-            use when doing the fetching (the special value of "now"
-            will cause the checkout to be updated on every build).
-            <filename>FETCHCOMMAND</filename> and
-            <filename>UPDATECOMMAND</filename> specify which executables
-            to use for the CVS checkout or update.
-        </para>
-
-        <para>
-            The supported parameters are module, tag, date,
-            method, localdir, rshand scmdata.
-            The module specifies which module to check out,
-            the tag describes which CVS TAG should be used for
-            the checkout.
-            By default, the TAG is empty.
-            A date can be specified to override the
-            <filename>SRCDATE</filename> of the
-            configuration to checkout a specific date.
-            The special value of "now" will cause the checkout to be
-            updated on every build.
-            method is by default pserver.
-            If ext is used the rsh parameter will be evaluated
-            and <filename>CVS_RSH</filename> will be set.
-            Finally, localdir is used to checkout into a special
-            directory relative to <filename>CVSDIR</filename>.
-            <literallayout class='monospaced'>
-     SRC_URI = "cvs://CVSROOT;module=mymodule;tag=some-version;method=ext"
-     SRC_URI = "cvs://CVSROOT;module=mymodule;date=20060126;localdir=usethat"
-            </literallayout>
-        </para>
-    </section>
-
-    <section id='http-ftp-fetcher'>
-        <title>HTTP/FTP fetcher</title>
-
-        <para>
-            The URNs for the HTTP/FTP fetcher are http, https, and ftp.
-            This fetcher honors the variables
-            <filename>FETCHCOMMAND_wget</filename>.
-            <filename>FETCHCOMMAND</filename> contains the command used
-            for fetching.
-            “${URI}” and “${FILES}” will be replaced by the URI and
-            basename of the file to be fetched.
-            <literallayout class='monospaced'>
-     SRC_URI = "http://oe.handhelds.org/not_there.aac"
-     SRC_URI = "ftp://oe.handhelds.org/not_there_as_well.aac"
-     SRC_URI = "ftp://you@oe.handheld.sorg/home/you/secret.plan"
-            </literallayout>
-        </para>
-    </section>
-
-    <section id='svn-fetcher'>
-        <title>SVN Fetcher</title>
-
-        <para>
-            The URN for the SVN fetcher is svn.
-        </para>
-
-        <para>
-            This fetcher honors the variables
-            <filename>FETCHCOMMAND_svn</filename>,
-            <filename>SVNDIR</filename>,
-            and <filename>SRCREV</filename>.
-            <filename>FETCHCOMMAND</filename> contains the
-            subversion command.
-            <filename>SRCREV</filename> specifies which revision
-            to use when doing the fetching.
-        </para>
-
-        <para>
-            The supported parameters are proto, rev and scmdata.
-            proto is the Subversion protocol, rev is the
-            Subversion revision.
-            If scmdata is set to “keep”, the “.svn” directories will
-            be available during compile-time.
-            <literallayout class='monospaced'>
-     SRC_URI = "svn://svn.oe.handhelds.org/svn;module=vip;proto=http;rev=667"
-     SRC_URI = "svn://svn.oe.handhelds.org/svn/;module=opie;proto=svn+ssh;date=20060126"
-            </literallayout>
-        </para>
-    </section>
-
-    <section id='git-fetcher'>
-        <title>GIT Fetcher</title>
-
-        <para>
-            The URN for the GIT Fetcher is git.
-        </para>
-
-        <para>
-            The variable <filename>GITDIR</filename> will be used as the
-            base directory where the Git tree is cloned to.
-        </para>
-
-        <para>
-            The parameters are tag, protocol, and scmdata.
-            The tag parameter is a Git tag, the default is “master”.
-            The protocol tag is the Git protocol to use and defaults to “git”
-            if a hostname is set, otherwise it is “file”.
-            If scmdata is set to “keep”, the “.git” directory will be available
-            during compile-time.
-            <literallayout class='monospaced'>
-     SRC_URI = "git://git.oe.handhelds.org/git/vip.git;tag=version-1"
-     SRC_URI = "git://git.oe.handhelds.org/git/vip.git;protocol=http"
-            </literallayout>
-        </para>
-    </section>
-</chapter>

bitbake/doc/user-manual/user-manual-hello.xml

@@ -1,321 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<chapter id='hello'>
-    <title>A BitBake Hello World</title>
-
-    <section id='bitbake-hello-world'>
-        <title>BitBake Hello World</title>
-
-        <para>
-            The simplest example commonly used to demonstrate any new
-            programming language or tool is the
-            <ulink url="http://en.wikipedia.org/wiki/Hello_world_program">Hello World</ulink>
-            example.
-            This chapter demonstrates, in tutorial form, Hello
-            World within the context of BitBake.
-            This tutorial describes how to create a new Project
-            and the applicable metadata files necessary to allow
-            BitBake to build it.
-        </para>
-    </section>
-
-    <section id='obtaining-bitbake'>
-        <title>Obtaining BitBake</title>
-
-        <para>
-            Please refer to Chapter 1 Section 1.7 for the various methods to
-            obtain BitBake.
-            Once the source code is on your machine the BitBake directory will
-            appear as follows:
-            <literallayout class='monospaced'>
-     $ ls -al
-     total 100
-     drwxrwxr-x. 9 wmat wmat  4096 Jan 31 13:44 .
-     drwxrwxr-x. 3 wmat wmat  4096 Feb  4 10:45 ..
-     -rw-rw-r--. 1 wmat wmat   365 Nov 26 04:55 AUTHORS
-     drwxrwxr-x. 2 wmat wmat  4096 Nov 26 04:55 bin
-     drwxrwxr-x. 4 wmat wmat  4096 Jan 31 13:44 build
-     -rw-rw-r--. 1 wmat wmat 16501 Nov 26 04:55 ChangeLog
-     drwxrwxr-x. 2 wmat wmat  4096 Nov 26 04:55 classes
-     drwxrwxr-x. 2 wmat wmat  4096 Nov 26 04:55 conf
-     drwxrwxr-x. 3 wmat wmat  4096 Nov 26 04:55 contrib
-     -rw-rw-r--. 1 wmat wmat 17987 Nov 26 04:55 COPYING
-     drwxrwxr-x. 3 wmat wmat  4096 Nov 26 04:55 doc
-     -rw-rw-r--. 1 wmat wmat    69 Nov 26 04:55 .gitignore
-     -rw-rw-r--. 1 wmat wmat   849 Nov 26 04:55 HEADER
-     drwxrwxr-x. 5 wmat wmat  4096 Jan 31 13:44 lib
-     -rw-rw-r--. 1 wmat wmat   195 Nov 26 04:55 MANIFEST.in
-     -rwxrwxr-x. 1 wmat wmat  3195 Jan 31 11:57 setup.py
-     -rw-rw-r--. 1 wmat wmat  2887 Nov 26 04:55 TODO
-            </literallayout>
-        </para>
-
-        <para>
-            At this point you should have BitBake extracted or cloned to
-            a directory and it should match the directory tree above.
-            Please note that you'll see your username wherever
-            "wmat" appears above.
-        </para>
-    </section>
-
-    <section id='setting-up-the-bitbake-environment'>
-        <title>Setting Up the BitBake Environment</title>
-
-        <para>
-            The recommended method to run BitBake is from a directory of your
-            choice.
-            The directory can be within your home directory or in
-            <filename>/usr/local</filename>,
-            depending on your preference.
-            Let's run BitBake now to make sure it's working.
-        </para>
-
-        <para>
-            From the BitBake source code directory, issue the following command:
-            <literallayout class='monospaced'>
-     $ ./bin/bitbake --version
-     BitBake Build Tool Core version 1.19.0, bitbake version
-     1.19.0
-            </literallayout>
-            You're now ready to use BitBake.
-        </para>
-
-        <para>
-            A final step to make development easier is to add the executable
-            binary to your environment <filename>PATH</filename>.
-            First, have a look at your current <filename>PATH</filename> variable.
-            If I check mine, I get:
-            <literallayout class='monospaced'>
-     $ echo $PATH
-     /home/wmat/bin:/usr/lib/lightdm/lightdm:/usr/local/sbin:/usr/local/bin:
-     /usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
-            </literallayout>
-            Now add the directory location for the BitBake binary to the <filename>PATH</filename>
-            with:
-            <literallayout class='monospaced'>
-     $ export PATH={path to the bitbake executable}:$PATH
-            </literallayout>
-            This will add the directory to the beginning of your PATH environment
-            variable.
-            For example, on my machine:
-            <literallayout class='monospaced'>
-     $ export PATH=/media/wmat/Backups/dev/bitbake/bin:$PATH
-     /media/wmat/Backups/dev/bitbake/bin:/home/wmat/bin:
-     /usr/lib/lightdm/lightdm:/usr/local/sbin:/usr/local/bin:
-     /usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
-            </literallayout>
-            Now, you should be able to simply enter the
-            <filename>bitbake</filename>
-            command at the command line to run bitbake.
-            For a more permanent solution and assuming you are running the BASH
-            shell, edit <filename>~/.bashrc</filename> and add the following to the end
-            of that file:
-            <literallayout class='monospaced'>
-     PATH={path to the bitbake executable}:$PATH
-            </literallayout>
-        </para>
-
-        <para>
-            Note that if you're a Vim user, you will find useful
-            Vim configuration contributions in the
-            <filename>contrib/vim</filename> directory.
-            Copy the files from that directory to your
-            <filename>/home/yourusername/.vim</filename>
-            directory.
-            If it doesn't exist, create it, and restart Vim.
-        </para>
-    </section>
-
-    <section id='the-hello-world-example'>
-        <title>The Hello World Example</title>
-
-        <para>
-            The following example leaps directly into how BitBake
-            works.
-            Every attempt is made to explain what is happening,
-            however, further information can be found in the
-            Metadata chapter.
-        </para>
-
-        <para>
-            The overall goal of this exercise is to create a Hello
-            World example utilizing concepts used to
-            build and construct a complete example application
-            including Tasks and Layers.
-            This is how modern projects such as OpenEmbedded and
-            the Yocto Project utilize BitBake, therefore it
-            provides an excellent starting point for understanding
-            BitBake.
-        </para>
-
-        <para>
-            It should be noted that this chapter was inspired by
-            and draws heavily from several sources:
-            <itemizedlist>
-                <listitem><para>
-                    <ulink href="http://www.mail-archive.com/yocto@yoctoproject.org/msg09379.html">Mailing List post - The BitBake equivalent of "Hello, World!"</ulink>
-                    </para></listitem>
-                <listitem><para>
-                    <ulink href="http://hambedded.org/blog/2012/11/24/from-bitbake-hello-world-to-an-image/">Hambedded Linux blog post - From Bitbake Hello World to an Image</ulink>
-                    </para></listitem>
-            </itemizedlist>
-        </para>
-
-        <section id='a-reverse-walkthrough'>
-            <title>A Reverse Walkthrough</title>
-
-            <para>
-                One of the best means to understand anything is to walk
-                through the steps to where we want to be by observing first
-                principles.
-                BitBake allows us to do this through the -D or Debug command
-               line parameter.
-                We know we want to eventually compile a HelloWorld example, but
-                we don't know what we need to do that.
-                Remember that BitBake utilizes three types of metadata files:
-                Configuration Files, Classes, and Recipes.
-                But where do they go, how does BitBake find them, etc. etc.?
-                Hopefully we can use BitBake's error messaging to figure this
-                out and better understand exactly what's going on.
-            </para>
-
-            <para>
-                First, let's begin by setting up a directory for our HelloWorld
-                project.
-                I'll do this in my home directory and change into that
-                directory:
-                <literallayout class='monospaced'>
-     $ mkdir ~/dev/hello &amp;&amp; cd ~/dev/hello
-                </literallayout>
-                Within this new, empty directory, let's run BitBake with
-                Debugging output and see what happens:
-                <literallayout class='monospaced'>
-     $ bitbake -DDD
-     The BBPATH variable is not set
-     DEBUG: Removed the following variables from the environment:
-     GNOME_DESKTOP_SESSION_ID, LESSOPEN, WINDOWID,
-     GNOME_KEYRING_CONTROL, DISPLAY, SSH_AGENT_PID, LANG,
-     XDG_SESSION_PATH, XAUTHORITY, LANGUAGE, SESSION_MANAGER,
-     SHLVL, MANDATORY_PATH, COMPIZ_CONFIG_PROFILE, TEXTDOMAIN,
-     GPG_AGENT_INFO, SSH_AUTH_SOCK, XDG_RUNTIME_DIR,
-     COMPIZ_BIN_PATH, GDMSESSION, DEFAULTS_PATH, TEXTDOMAINDIR,
-     XDG_SEAT_PATH, XDG_CONFIG_DIRS, XDG_CURRENT_DESKTOP,
-     DBUS_SESSION_BUS_ADDRESS, _, XDG_SESSION_COOKIE,
-     DESKTOP_SESSION, LESSCLOSE, GNOME_KEYRING_PID,
-     UBUNTU_MENUPROXY, OLDPWD, GTK_MODULES, XDG_DATA_DIRS,
-     COLORTERM, LS_COLORS
-                </literallayout>
-                The majority of this output is specific to environment variables
-                that are not directly relevant to BitBake.
-                However, the very
-                first message <filename>The BBPATH variable is not set</filename>
-                is and needs to be rectified.
-                So how do we set the BBPATH
-                variable?
-            </para>
-
-            <para>
-                When BitBake is run it begins looking for metadata files.
-                The BBPATH variable is what tells BitBake where to look.
-                It is possible to set BBPATH as an environment variable as you
-                did above for the BitBake exexcutable's PATH.
-                However, it's much more flexible to set the BBPATH variable for
-                each project, as this allows for greater flexibility.
-            </para>
-
-            <para>
-                Without BBPATH Bitbake will not find any <filename>.conf</filename>
-                files or recipe files at all.
-                It will also not find <filename>bitbake.conf</filename>.
-                Note the reference to <filename>conf/</filename>.
-                It is standard practice to organize the project's directory tree
-                to include a <filename>conf/</filename> and a
-                <filename>classes/</filename> directory.
-                Add those now to your project directory:
-                <literallayout class='monospaced'>
-     $ mkdir conf classes
-                </literallayout>
-                Now let's copy the sample configuration files provided in the
-                BitBake source tree to their appropriate conf and classes
-                directory.
-                Change to the BitBake source tree directory and:
-                <literallayout class='monospaced'>
-     cp conf/bitbake.conf ~/dev/hello/conf/
-     cp classes/base.bbclass ~/dev/hello/classes/
-                </literallayout>
-                At this point your project directory structure should look like
-                the following:
-               <literallayout class='monospaced'>
-     ~/dev/hello$ tree
-     .
-     ├── classes
-     │   └── base.bbclass
-     └── conf
-     └── bitbake.conf
-                </literallayout>
-            </para>
-
-            <para>
-                But what about BBPATH, we still haven't set it?
-            </para>
-
-            <para>
-                The first configuration file that BitBake looks for is always
-                <filename>bblayers.conf</filename>.
-                With this knowledge we know that to resolve our BBPATH error we
-                can add a <filename>conf/bblayers.conf</filename> file to our
-                project source tree and populate it with the BBPATH variable
-                declaration.
-                From your project source tree:
-                <literallayout class='monospaced'>
-     $ vim conf/bblayers.conf
-                </literallayout>
-                Add the following to the empty bblayers.conf file:
-                <literallayout class='monospaced'>
-     BBPATH := "${TOPDIR}"
-                </literallayout>
-            </para>
-
-            <para>
-                Now from the root of our project directory, let's run BitBake
-                again and see what happens:
-                <literallayout class='monospaced'>
-     $ bitbake -DDD
-     Nothing to do.  Use 'bitbake world' to build everything, or run
-     'bitbake --help' for usage information.
-     DEBUG: Removed the following variables from the environment:
-     GNOME_DESKTOP_SESSION_ID, LESSOPEN, WINDOWID,
-     GNOME_KEYRING_CONTROL, DISPLAY, SSH_AGENT_PID, LANG,
-     XDG_SESSION_PATH, XAUTHORITY, LANGUAGE, SESSION_MANAGER,
-     SHLVL, MANDATORY_PATH, COMPIZ_CONFIG_PROFILE, TEXTDOMAIN,
-     GPG_AGENT_INFO, SSH_AUTH_SOCK, XDG_RUNTIME_DIR,
-     COMPIZ_BIN_PATH, GDMSESSION, DEFAULTS_PATH, TEXTDOMAINDIR,
-     XDG_SEAT_PATH, XDG_CONFIG_DIRS, XDG_CURRENT_DESKTOP,
-     DBUS_SESSION_BUS_ADDRESS, _, XDG_SESSION_COOKIE,
-     DESKTOP_SESSION, LESSCLOSE, GNOME_KEYRING_PID, UBUNTU_MENUPROXY,
-     OLDPWD, GTK_MODULES, XDG_DATA_DIRS, COLORTERM, LS_COLORS
-     DEBUG: Found bblayers.conf (/home/wmat/dev/hello/conf/
-     bblayers.conf)
-     DEBUG: LOAD /home/wmat/dev/hello/conf/bblayers.conf
-     DEBUG: LOAD /home/wmat/dev/hello/conf/bitbake.conf
-     DEBUG: BB configuration INHERITs:0: inheriting /home/wmat/dev/
-     hello/classes/base.bbclass
-     DEBUG: BB /home/wmat/dev/hello/classes/base.bbclass: handle
-     (data, include)
-     DEBUG: LOAD /home/wmat/dev/hello/classes/base.bbclass
-     DEBUG: Clearing SRCREV cache due to cache policy of: clear
-     DEBUG: Using cache in '/home/wmat/dev/hello/tmp/cache/
-     local_file_checksum_cache.dat'
-     DEBUG: Using cache in '/home/wmat/dev/hello/tmp/cache/
-     bb_codeparser.dat'
-                </literallayout>
-                <note>
-                    From this point forward, the environment variable
-                    removal messages will be ignored and omitted.
-                    Let's examine the relevant DEBUG messages:
-                </note>
-            </para>
-        </section>
-    </section>
-</chapter>

bitbake/doc/user-manual/user-manual-intro.xml

@@ -1,316 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-    "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<chapter id="user-manual-intro">
-    <title>Overview</title>
-
-    <section id="intro">
-        <title>Introduction</title>
-
-        <para>
-            fundamentally, BitBake is a generic task execution
-            engine that allows shell and Python tasks to be run
-            efficiently and in parallel while working within
-            complex inter-task dependency constraints.
-            One of BitBake's main users, OpenEmbedded, takes this core
-            and builds embedded Linux software stacks using
-            a task-oriented approach.
-        </para>
-
-        <para>
-            Conceptually, BitBake is similar to GNU Make in
-            some regards but has significant differences:
-            <itemizedlist>
-                <listitem><para>
-                    BitBake executes tasks according to provided
-                    metadata that builds up the tasks.
-                    Metadata is stored in recipe (<filename>.bb</filename>),
-                    configuration (<filename>.conf</filename>), and class
-                    (<filename>.bbclass</filename>) files and provides
-                    BitBake with instructions on what tasks to run and
-                    the dependencies between those tasks.
-                    </para></listitem>
-                <listitem><para>
-                    BitBake includes a fetcher library for obtaining source
-                    code from various places such as source control
-                    systems or websites.
-                    </para></listitem>
-                <listitem><para>
-                    The instructions for each unit to be built (e.g. a piece
-                    of software) are known as recipe files and
-                    contain all the information about the unit
-                    (dependencies, source file locations, checksums, description
-                    and so on).
-                    </para></listitem>
-                <listitem><para>
-                    BitBake includes a client/server abstraction and can
-                    be used from a command line or used as a service over XMLRPC and
-                    has several different user interfaces.
-                    </para></listitem>
-            </itemizedlist>
-        </para>
-    </section>
-
-    <section id="history-and-goals">
-        <title>History and Goals</title>
-
-        <para>
-            BitBake was originally a part of the OpenEmbedded project.
-            It was inspired by the Portage package management system
-            used by the Gentoo Linux distribution.
-            On December 7, 2004, OpenEmbedded project team member,
-            Chris Larson split the project into two distinct pieces:
-            <itemizedlist>
-                <listitem><para>BitBake, a generic task executor</para></listitem>
-                <listitem><para>OpenEmbedded, a metadata set utilized by
-                    BitBake</para></listitem>
-            </itemizedlist>
-            Today, BitBake is the primary basis of the
-            <ulink url="http://www.openembedded.org/">OpenEmbedded</ulink>
-            project, which is being used to build and maintain a
-            number of projects and embedded Linux distributions
-            such as the Angstrom Distribution and the Yocto
-            Project.
-        </para>
-
-        <para>
-            Prior to BitBake, no other build tool adequately met the needs of
-            an aspiring embedded Linux distribution.
-            All of the build systems used by traditional desktop Linux
-            distributions lacked important functionality, and none of the
-            ad-hoc buildroot systems, prevalent in the
-            embedded space, were scalable or maintainable.
-        </para>
-
-        <para>
-            Some important original goals for BitBake were:
-            <itemizedlist>
-                <listitem><para>
-                    Handle cross-compilation.
-                    </para></listitem>
-                <listitem><para>
-                    Handle inter-package dependencies (build time on
-                    target architecture, build time on native
-                    architecture, and runtime).
-                    </para></listitem>
-                <listitem><para>
-                    Support running any number of tasks within a given
-                    package, including, but not limited to, fetching
-                    upstream sources, unpacking them, patching them,
-                    configuring them, and so forth.
-                    </para></listitem>
-                <listitem><para>
-                    Be Linux distribution agnostic for both build and
-                    target systems.
-                    </para></listitem>
-                <listitem><para>
-                    Be architecture agnostic.
-                    </para></listitem>
-                <listitem><para>
-                    Support multiple build and target operating systems
-                    (e.g. Cygwin, the BSDs, and so forth).
-                    </para></listitem>
-                <listitem><para>
-                    Be self contained, rather than tightly
-                    integrated into the build machine's root
-                    filesystem.
-                    </para></listitem>
-                <listitem><para>
-                    Handle conditional metadata on the target architecture,
-                    operating system, distribution, and machine.
-                    </para></listitem>
-                <listitem><para>
-                    Be easy to use the tools to supply local metadata and packages
-                    against which to operate.
-                    </para></listitem>
-                <listitem><para>
-                    Be easy to use BitBake to collaborate between multiple
-                    projects for their builds.
-                    </para></listitem>
-                <listitem><para>
-                    Provide an inheritance mechanism that share
-                    common metadata between many packages.
-                    </para></listitem>
-            </itemizedlist>
-            Over time it became apparent that some further requirements
-            were necessary:
-            <itemizedlist>
-                <listitem><para>
-                    Handle variants of a base recipe (e.g. native, sdk,
-                    and multilib).
-                    </para></listitem>
-                <listitem><para>
-                    Split metadata into layers and allow layers
-                    to override each other.
-                    </para></listitem>
-                <listitem><para>
-                    Allow representation of a given set of input variables
-                    to a task as a checksum.
-                    Based on that checksum, allow acceleration of builds
-                    with prebuilt components.
-                    </para></listitem>
-            </itemizedlist>
-            BitBake satisfies all the original requirements and many more
-            with extensions being made to the basic functionality to
-            reflect the additional requirements.
-            Flexibility and power have always been the priorities.
-            BitBake is highly extensible and supports embedded Python code and
-            execution of any arbitrary tasks.
-        </para>
-    </section>
-
-    <section id="Concepts">
-        <title>Concepts</title>
-
-        <para>
-            BitBake is a program written in the Python language.
-            At the highest level, BitBake interprets metadata, decides
-            what tasks are required to run, and executes those tasks.
-            Similar to GNU Make, BitBake controls how software is
-            built.
-            GNU Make achieves its control through "makefiles".
-            BitBake uses "recipes".
-        </para>
-
-        <para>
-            BitBake extends the capabilities of a simple
-            tool like GNU Make by allowing for much more complex tasks
-            to be completed, such as assembling entire embedded Linux
-            distributions.
-        </para>
-
-        <para>
-            The remainder of this section introduces several concepts
-            that should be understood in order to better leverage
-            the power of BitBake.
-        </para>
-
-        <section id='recipes'>
-            <title>Recipes</title>
-
-            <para>
-                BitBake Recipes, which are denoted by the file extension
-                <filename>.bb</filename>, are the most basic metadata files.
-                These recipe files provide BitBake the following:
-                <itemizedlist>
-                    <listitem><para>Descriptive information about the package</para></listitem>
-                    <listitem><para>The version of the recipe</para></listitem>
-                    <listitem><para>When dependencies exist</para></listitem>
-                    <listitem><para>Where the source code resides</para></listitem>
-                    <listitem><para>Whether the source code requires any patches</para></listitem>
-                    <listitem><para>How to compile the source code</para></listitem>
-                    <listitem><para>Where on the target machine to install the
-                        package being compiled</para></listitem>
-                </itemizedlist>
-            </para>
-
-            <para>
-                Within the context of BitBake, or any project utilizing BitBake
-                as it's build system, files with the <filename>.bb</filename>
-                extension are referred to as recipes.
-                <note>
-                    The term "package" is also commonly used to describe recipes.
-                    However, since the same word is used to describe packaged
-                    output from a project, it is best to maintain a single
-                    descriptive term, "recipes".
-                </note>
-            </para>
-        </section>
-
-        <section id='configuration-files'>
-            <title>Configuration Files</title>
-
-            <para>
-                Configuration files, which are denoted by the
-                <filename>.conf</filename> extension, define
-                various configuration variables that govern the project's build
-                process.
-                These files fall into several areas that define
-                machine configuration options, distribution configuration
-                options, compiler tuning options, general common
-                configuration options, and user configuration options.
-                The main configuration file is the sample
-                <filename>bitbake.conf</filename> file, which is
-                located within the BitBake source tree
-                <filename>conf</filename> directory.
-            </para>
-        </section>
-
-        <section id='classes'>
-            <title>Classes</title>
-
-            <para>
-                Class files, which are denoted by the
-                <filename>.bbclass</filename> extension, contain
-                information that is useful to share between metadata files.
-                The BitBake source tree currently comes with one class metadata file
-                called <filename>base.bbclass</filename>.
-                You can find this file in the
-                <filename>classes</filename> directory.
-                The <filename>base.bbclass</filename> is special in that any
-                new classes that a developer adds to a project are required to
-                inherit <filename>base.bbclass</filename> automatically.
-                This class contains definitions for standard basic tasks such
-                as fetching, unpacking, configuring (empty by default),
-                compiling (runs any Makefile present), installing (empty by
-                default) and packaging (empty by default).
-                These tasks are often overridden or extended by other classes
-                added during the project development process.
-            </para>
-        </section>
-    </section>
-
-    <section id='obtaining-bitbake'>
-        <title>Obtaining BitBake</title>
-
-        <para>
-            You can obtain BitBake several different ways:
-            <itemizedlist>
-                <listitem><para><emphasis>Installation using your Distribution
-                    Package Management System:</emphasis>
-                    This method is not
-                    recommended because the BitBake version, in most
-                    cases provided by your distribution, is several
-                    releases behind a snapshot of the BitBake repository.
-                    </para></listitem>
-                <listitem><para><emphasis>Taking a snapshot of BitBake:</emphasis>
-                    Downloading a snapshot of BitBake from the
-                    source code repository is the recommended method
-                    as you are assured of having the most recent stable
-                    BitBake release.</para>
-                    <para>The following example downloads a snapshot of
-                    BitBake version 1.17.0:
-                    <literallayout class='monospaced'>
-     $ wget http://git.openembedded.org/bitbake/snapshot/bitbake-1.17.0.tar.gz
-     $ tar zxpvf bitbake-1.17.0.tar.gz
-                    </literallayout>
-                    After extraction of the tarball using the tar utility,
-                    you have a directory entitled
-                    <filename>bitbake-1.17.0</filename>.
-                    </para></listitem>
-                <listitem><para><emphasis>Cloning BitBake:</emphasis>
-                    Using Git to clone the BitBake source code repository
-                    is also a recommended method when you need the absolute latest
-                    BitBake source.
-                    Realize that using this method could expose you to areas of
-                    BitBake that are under development.</para>
-                    <para>Here is an example:
-                    <literallayout class='monospaced'>
-     $ git clone git://git.openembedded.org/bitbake
-                    </literallayout>
-                    This command clones the BitBake Git repository into a
-                    directory called <filename>bitbake</filename>.
-                    Alternatively, you can
-                    designate a directory after the
-                    <filename>git clone</filename> command
-                    if you want to call the new directory something
-                    other than <filename>bitbake</filename>.
-                    Here is an example that names the directory
-                    <filename>bbdev</filename>:
-                    <literallayout class='monospaced'>
-     $ git clone git://git.openembedded.org/bitbake bbdev
-                    </literallayout></para></listitem>
-            </itemizedlist>
-        </para>
-    </section>
-</chapter>

bitbake/doc/user-manual/user-manual-style.css

@@ -1,978 +0,0 @@
-/*
-   Generic XHTML / DocBook XHTML CSS Stylesheet.
-
-   Browser wrangling and typographic design by
-      Oyvind Kolas / pippin@gimp.org
-
-   Customised for Poky by
-      Matthew Allum / mallum@o-hand.com
-
-   Thanks to:
-     Liam R. E. Quin
-     William Skaggs
-     Jakub Steiner
-
-   Structure
-   ---------
-
-   The stylesheet is divided into the following sections:
-
-       Positioning
-          Margins, paddings, width, font-size, clearing.
-       Decorations
-          Borders, style
-       Colors
-          Colors
-       Graphics
-          Graphical backgrounds
-       Nasty IE tweaks
-          Workarounds needed to make it work in internet explorer,
-          currently makes the stylesheet non validating, but up until
-          this point it is validating.
-       Mozilla extensions
-          Transparency for footer
-	  Rounded corners on boxes
-
-*/
-
-
-  /*************** /
- /  Positioning   /
-/ ***************/
-
-body {
-  font-family: Verdana, Sans, sans-serif;
-
-  min-width: 640px;
-  width: 80%;
-  margin:  0em auto;
-  padding: 2em 5em 5em 5em;
-  color: #333;
-}
-
-h1,h2,h3,h4,h5,h6,h7 {
-  font-family: Arial, Sans;
-  color: #00557D;
-  clear: both;
-}
-
-h1 {
-  font-size: 2em;
-  text-align: left;
-  padding: 0em 0em 0em 0em;
-  margin: 2em 0em 0em 0em;
-}
-
-h2.subtitle {
-  margin: 0.10em 0em 3.0em 0em;
-  padding: 0em 0em 0em 0em;
-  font-size: 1.8em;
-  padding-left: 20%;
-  font-weight: normal;
-  font-style: italic;
-}
-
-h2 {
-  margin: 2em 0em 0.66em 0em;
-  padding: 0.5em 0em 0em 0em;
-  font-size: 1.5em;
-  font-weight: bold;
-}
-
-h3.subtitle {
-  margin: 0em 0em 1em 0em;
-  padding: 0em 0em 0em 0em;
-  font-size: 142.14%;
-  text-align: right;
-}
-
-h3 {
-  margin: 1em 0em 0.5em 0em;
-  padding: 1em 0em 0em 0em;
-  font-size: 140%;
-  font-weight: bold;
-}
-
-h4 {
-  margin: 1em 0em 0.5em 0em;
-  padding: 1em 0em 0em 0em;
-  font-size: 120%;
-  font-weight: bold;
-}
-
-h5 {
-  margin: 1em 0em 0.5em 0em;
-  padding: 1em 0em 0em 0em;
-  font-size: 110%;
-  font-weight: bold;
-}
-
-h6 {
-  margin: 1em 0em 0em 0em;
-  padding: 1em 0em 0em 0em;
-  font-size: 110%;
-  font-weight: bold;
-}
-
-.authorgroup {
-  background-color: transparent;
-  background-repeat: no-repeat;
-  padding-top: 256px;
-  background-image: url("figures/bitbake-title.png");
-  background-position: left top;
-  margin-top: -256px;
-  padding-right: 50px;
-  margin-left: 0px;
-  text-align: right;
-  width: 740px;
-}
-
-h3.author {
-  margin: 0em 0me 0em 0em;
-  padding: 0em 0em 0em 0em;
-  font-weight: normal;
-  font-size: 100%;
-  color: #333;
-  clear: both;
-}
-
-.author tt.email {
-  font-size: 66%;
-}
-
-.titlepage hr {
-  width: 0em;
-  clear: both;
-}
-
-.revhistory {
-  padding-top: 2em;
-  clear: both;
-}
-
-.toc,
-.list-of-tables,
-.list-of-examples,
-.list-of-figures {
-  padding: 1.33em 0em 2.5em 0em;
-  color: #00557D;
-}
-
-.toc p,
-.list-of-tables p,
-.list-of-figures p,
-.list-of-examples p {
-  padding: 0em 0em 0em 0em;
-  padding: 0em 0em 0.3em;
-  margin: 1.5em 0em 0em 0em;
-}
-
-.toc p b,
-.list-of-tables p b,
-.list-of-figures p b,
-.list-of-examples p b{
-  font-size: 100.0%;
-  font-weight: bold;
-}
-
-.toc dl,
-.list-of-tables dl,
-.list-of-figures dl,
-.list-of-examples dl {
-  margin: 0em 0em 0.5em 0em;
-  padding: 0em 0em 0em 0em;
-}
-
-.toc dt {
-  margin: 0em 0em 0em 0em;
-  padding: 0em 0em 0em 0em;
-}
-
-.toc dd {
-  margin: 0em 0em 0em 2.6em;
-  padding: 0em 0em 0em 0em;
-}
-
-div.glossary dl,
-div.variablelist dl {
-}
-
-.glossary dl dt,
-.variablelist dl dt,
-.variablelist dl dt span.term {
-  font-weight: normal;
-  width: 20em;
-  text-align: right;
-}
-
-.variablelist dl dt {
-  margin-top: 0.5em;
-}
-
-.glossary dl dd,
-.variablelist dl dd {
-  margin-top: -1em;
-  margin-left: 25.5em;
-}
-
-.glossary dd p,
-.variablelist dd p {
-  margin-top: 0em;
-  margin-bottom: 1em;
-}
-
-
-div.calloutlist table td {
-  padding: 0em 0em 0em 0em;
-  margin: 0em 0em 0em 0em;
-}
-
-div.calloutlist table td p {
-  margin-top: 0em;
-  margin-bottom: 1em;
-}
-
-div p.copyright {
-  text-align: left;
-}
-
-div.legalnotice p.legalnotice-title {
-  margin-bottom: 0em;
-}
-
-p {
-  line-height: 1.5em;
-  margin-top: 0em;
-
-}
-
-dl {
-  padding-top: 0em;
-}
-
-hr {
-  border: solid 1px;
-}
-
-
-.mediaobject,
-.mediaobjectco {
-  text-align: center;
-}
-
-img {
-  border: none;
-}
-
-ul {
-  padding: 0em 0em 0em 1.5em;
-}
-
-ul li {
-  padding: 0em 0em 0em 0em;
-}
-
-ul li p {
-  text-align: left;
-}
-
-table {
-  width :100%;
-}
-
-th {
-  padding: 0.25em;
-  text-align: left;
-  font-weight: normal;
-  vertical-align: top;
-}
-
-td {
-  padding: 0.25em;
-  vertical-align: top;
-}
-
-p a[id] {
-  margin: 0px;
-  padding: 0px;
-  display: inline;
-  background-image: none;
-}
-
-a {
-  text-decoration: underline;
-  color: #444;
-}
-
-pre {
-    overflow: auto;
-}
-
-a:hover {
-  text-decoration: underline;
-  /*font-weight: bold;*/
-}
-
-
-div.informalfigure,
-div.informalexample,
-div.informaltable,
-div.figure,
-div.table,
-div.example {
-  margin: 1em 0em;
-  padding: 1em;
-  page-break-inside: avoid;
-}
-
-
-div.informalfigure p.title b,
-div.informalexample p.title b,
-div.informaltable p.title b,
-div.figure p.title b,
-div.example p.title b,
-div.table p.title b{
-    padding-top: 0em;
-    margin-top: 0em;
-    font-size: 100%;
-    font-weight: normal;
-}
-
-.mediaobject .caption,
-.mediaobject .caption p  {
-  text-align: center;
-  font-size: 80%;
-  padding-top: 0.5em;
-  padding-bottom: 0.5em;
-}
-
-.epigraph {
-  padding-left: 55%;
-  margin-bottom: 1em;
-}
-
-.epigraph p {
-  text-align: left;
-}
-
-.epigraph .quote {
-  font-style: italic;
-}
-.epigraph .attribution {
-  font-style: normal;
-  text-align: right;
-}
-
-span.application {
-  font-style: italic;
-}
-
-.programlisting {
-  font-family: monospace;
-  font-size: 80%;
-  white-space: pre;
-  margin: 1.33em 0em;
-  padding: 1.33em;
-}
-
-.tip,
-.warning,
-.caution,
-.note {
-  margin-top: 1em;
-  margin-bottom: 1em;
-
-}
-
-/* force full width of table within div */
-.tip table,
-.warning table,
-.caution table,
-.note table {
-  border: none;
-  width: 100%;
-}
-
-
-.tip table th,
-.warning table th,
-.caution table th,
-.note table th {
-  padding: 0.8em 0.0em 0.0em 0.0em;
-  margin : 0em 0em 0em 0em;
-}
-
-.tip p,
-.warning p,
-.caution p,
-.note p {
-  margin-top: 0.5em;
-  margin-bottom: 0.5em;
-  padding-right: 1em;
-  text-align: left;
-}
-
-.acronym {
-  text-transform: uppercase;
-}
-
-b.keycap,
-.keycap {
-  padding: 0.09em 0.3em;
-  margin: 0em;
-}
-
-.itemizedlist li {
-  clear: none;
-}
-
-.filename {
-  font-size: medium;
-  font-family: Courier, monospace;
-}
-
-
-div.navheader, div.heading{
-  position: absolute;
-  left: 0em;
-  top: 0em;
-  width: 100%;
-  background-color: #cdf;
-  width: 100%;
-}
-
-div.navfooter, div.footing{
-  position: fixed;
-  left: 0em;
-  bottom: 0em;
-  background-color: #eee;
-  width: 100%;
-}
-
-
-div.navheader td,
-div.navfooter td {
-  font-size: 66%;
-}
-
-div.navheader table th {
-  /*font-family: Georgia, Times, serif;*/
-  /*font-size: x-large;*/
-  font-size: 80%;
-}
-
-div.navheader table {
-  border-left: 0em;
-  border-right: 0em;
-  border-top: 0em;
-  width: 100%;
-}
-
-div.navfooter table {
-  border-left: 0em;
-  border-right: 0em;
-  border-bottom: 0em;
-  width: 100%;
-}
-
-div.navheader table td a,
-div.navfooter table td a {
-  color: #777;
-  text-decoration: none;
-}
-
-/* normal text in the footer */
-div.navfooter table td {
-  color: black;
-}
-
-div.navheader table td a:visited,
-div.navfooter table td a:visited {
-  color: #444;
-}
-
-
-/* links in header and footer */
-div.navheader table td a:hover,
-div.navfooter table td a:hover {
-  text-decoration: underline;
-  background-color: transparent;
-  color: #33a;
-}
-
-div.navheader hr,
-div.navfooter hr {
-  display: none;
-}
-
-
-.qandaset tr.question td p {
-  margin: 0em 0em 1em 0em;
-  padding: 0em 0em 0em 0em;
-}
-
-.qandaset tr.answer td p {
-  margin: 0em 0em 1em 0em;
-  padding: 0em 0em 0em 0em;
-}
-.answer td {
-  padding-bottom: 1.5em;
-}
-
-.emphasis {
-  font-weight: bold;
-}
-
-
-  /************* /
- / decorations  /
-/ *************/
-
-.titlepage {
-}
-
-.part .title {
-}
-
-.subtitle {
-    border: none;
-}
-
-/*
-h1 {
-  border: none;
-}
-
-h2 {
-  border-top: solid 0.2em;
-  border-bottom: solid 0.06em;
-}
-
-h3 {
-  border-top: 0em;
-  border-bottom: solid 0.06em;
-}
-
-h4 {
-  border: 0em;
-  border-bottom: solid 0.06em;
-}
-
-h5 {
-  border: 0em;
-}
-*/
-
-.programlisting {
-  border: solid 1px;
-}
-
-div.figure,
-div.table,
-div.informalfigure,
-div.informaltable,
-div.informalexample,
-div.example {
-  border: 1px solid;
-}
-
-
-
-.tip,
-.warning,
-.caution,
-.note {
-  border: 1px solid;
-}
-
-.tip table th,
-.warning table th,
-.caution table th,
-.note table th {
-  border-bottom: 1px solid;
-}
-
-.question td {
-  border-top: 1px solid black;
-}
-
-.answer {
-}
-
-
-b.keycap,
-.keycap {
-  border: 1px solid;
-}
-
-
-div.navheader, div.heading{
-  border-bottom: 1px solid;
-}
-
-
-div.navfooter, div.footing{
-  border-top: 1px solid;
-}
-
-  /********* /
- /  colors  /
-/ *********/
-
-body {
-  color: #333;
-  background: white;
-}
-
-a {
-  background: transparent;
-}
-
-a:hover {
-  background-color: #dedede;
-}
-
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-h7,
-h8 {
-  background-color: transparent;
-}
-
-hr {
-  border-color: #aaa;
-}
-
-
-.tip, .warning, .caution, .note {
-  border-color: #fff;
-}
-
-
-.tip table th,
-.warning table th,
-.caution table th,
-.note table th {
-  border-bottom-color: #fff;
-}
-
-
-.warning {
-  background-color: #f0f0f2;
-}
-
-.caution {
-  background-color: #f0f0f2;
-}
-
-.tip {
-  background-color: #f0f0f2;
-}
-
-.note {
-  background-color: #f0f0f2;
-}
-
-.glossary dl dt,
-.variablelist dl dt,
-.variablelist dl dt span.term {
-  color: #044;
-}
-
-div.figure,
-div.table,
-div.example,
-div.informalfigure,
-div.informaltable,
-div.informalexample {
-  border-color: #aaa;
-}
-
-pre.programlisting {
-  color: black;
-  background-color: #fff;
-  border-color: #aaa;
-  border-width: 2px;
-}
-
-.guimenu,
-.guilabel,
-.guimenuitem {
-  background-color: #eee;
-}
-
-
-b.keycap,
-.keycap {
-  background-color: #eee;
-  border-color: #999;
-}
-
-
-div.navheader {
-  border-color: black;
-}
-
-
-div.navfooter {
-  border-color: black;
-}
-
-
-  /*********** /
- /  graphics  /
-/ ***********/
-
-/*
-body {
-  background-image: url("images/body_bg.jpg");
-  background-attachment: fixed;
-}
-
-.navheader,
-.note,
-.tip {
-  background-image: url("images/note_bg.jpg");
-  background-attachment: fixed;
-}
-
-.warning,
-.caution {
-  background-image: url("images/warning_bg.jpg");
-  background-attachment: fixed;
-}
-
-.figure,
-.informalfigure,
-.example,
-.informalexample,
-.table,
-.informaltable {
-  background-image: url("images/figure_bg.jpg");
-  background-attachment: fixed;
-}
-
-*/
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-h7{
-}
-
-/*
-Example of how to stick an image as part of the title.
-
-div.article .titlepage .title
-{
-  background-image: url("figures/white-on-black.png");
-  background-position: center;
-  background-repeat: repeat-x;
-}
-*/
-
-div.preface .titlepage .title,
-div.colophon .title,
-div.chapter .titlepage .title,
-div.article .titlepage .title
-{
-}
-
-div.section div.section .titlepage .title,
-div.sect2 .titlepage .title {
-    background: none;
-}
-
-
-h1.title {
-  background-color: transparent;
-  background-image: url("figures/yocto-project-bw.png");
-  background-repeat: no-repeat;
-  height: 256px;
-  text-indent: -9000px;
-  overflow:hidden;
-}
-
-h2.subtitle {
-  background-color: transparent;
-  text-indent: -9000px;
-  overflow:hidden;
-  width: 0px;
-  display: none;
-}
-
-  /*************************************** /
- /  pippin.gimp.org specific alterations  /
-/ ***************************************/
-
-/*
-div.heading, div.navheader {
-  color: #777;
-  font-size: 80%;
-  padding: 0;
-  margin: 0;
-  text-align: left;
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  width: 100%;
-  height: 50px;
-  background: url('/gfx/heading_bg.png') transparent;
-  background-repeat: repeat-x;
-  background-attachment: fixed;
-  border: none;
-}
-
-div.heading a {
-  color: #444;
-}
-
-div.footing, div.navfooter {
-  border: none;
-  color: #ddd;
-  font-size: 80%;
-  text-align:right;
-
-  width: 100%;
-  padding-top: 10px;
-  position: absolute;
-  bottom: 0px;
-  left: 0px;
-
-  background: url('/gfx/footing_bg.png') transparent;
-}
-*/
-
-
-
-  /****************** /
- /  nasty ie tweaks  /
-/ ******************/
-
-/*
-div.heading, div.navheader {
-  width:expression(document.body.clientWidth + "px");
-}
-
-div.footing, div.navfooter {
-  width:expression(document.body.clientWidth + "px");
-  margin-left:expression("-5em");
-}
-body {
-  padding:expression("4em 5em 0em 5em");
-}
-*/
-
-  /**************************************** /
- / mozilla vendor specific css extensions  /
-/ ****************************************/
-/*
-div.navfooter, div.footing{
-  -moz-opacity: 0.8em;
-}
-
-div.figure,
-div.table,
-div.informalfigure,
-div.informaltable,
-div.informalexample,
-div.example,
-.tip,
-.warning,
-.caution,
-.note {
-  -moz-border-radius: 0.5em;
-}
-
-b.keycap,
-.keycap {
-  -moz-border-radius: 0.3em;
-}
-*/
-
-table tr td table tr td {
-  display: none;
-}
-
-
-hr {
-  display: none;
-}
-
-table {
-  border: 0em;
-}
-
- .photo {
-  float: right;
-  margin-left:   1.5em;
-  margin-bottom: 1.5em;
-  margin-top: 0em;
-  max-width:      17em;
-  border:     1px solid gray;
-  padding:    3px;
-  background: white;
-}
- .seperator {
-   padding-top: 2em;
-   clear: both;
-  }
-
-  #validators {
-      margin-top: 5em;
-      text-align: right;
-      color: #777;
-  }
-  @media print {
-      body {
-          font-size: 8pt;
-      }
-      .noprint {
-          display: none;
-      }
-  }
-
-
-.tip,
-.note {
-   background: #f0f0f2;
-   color: #333;
-   padding: 20px;
-   margin: 20px;
-}
-
-.tip h3,
-.note h3 {
-   padding: 0em;
-   margin: 0em;
-   font-size: 2em;
-   font-weight: bold;
-   color: #333;
-}
-
-.tip a,
-.note a {
-   color: #333;
-   text-decoration: underline;
-}
-
-.footnote {
-   font-size: small;
-   color: #333;
-}
-
-/* Changes the announcement text */
-.tip h3,
-.warning h3,
-.caution h3,
-.note h3 {
-   font-size:large;
-   color: #00557D;
-}

bitbake/doc/user-manual/user-manual.xml

@@ -1,86 +0,0 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<book id='bitbake-user-manual' lang='en'
-        xmlns:xi="http://www.w3.org/2003/XInclude"
-        xmlns="http://docbook.org/ns/docbook"
-        >
-    <bookinfo>
-
-        <mediaobject>
-            <imageobject>
-                <imagedata fileref='figures/bitbake-title.png'
-                    format='SVG'
-                    align='left' scalefit='1' width='100%'/>
-            </imageobject>
-        </mediaobject>
-
-        <title>
-            BitBake User Manual
-        </title>
-
-        <authorgroup>
-            <author>
-                <firstname>Richard Purdie, Chris Larson, and </firstname> <surname>Phil Blundell</surname>
-                <affiliation>
-                    <orgname>BitBake Community</orgname>
-                </affiliation>
-                <email>bitbake-devel@lists.openembedded.org</email>
-            </author>
-        </authorgroup>
-
-<!--
-# Add in some revision history if we want it here.
-        <revhistory>
-            <revision>
-                <revnumber>x.x</revnumber>
-                <date>dd month year</date>
-                <revremark>Some relevent comment</revremark>
-            </revision>
-            <revision>
-                <revnumber>x.x</revnumber>
-                <date>dd month year</date>
-                <revremark>Some relevent comment</revremark>
-            </revision>
-            <revision>
-                <revnumber>x.x</revnumber>
-                <date>dd month year</date>
-                <revremark>Some relevent comment</revremark>
-            </revision>
-            <revision>
-                <revnumber>x.x</revnumber>
-                <date>dd month year</date>
-                <revremark>Some relevent comment</revremark>
-            </revision>
-       </revhistory>
--->
-
-        <copyright>
-            <year>2004-2014</year>
-            <holder>Richard Purdie</holder>
-            <holder>Chris Larson</holder>
-            <holder>and Phil Blundell</holder>
-        </copyright>
-
-        <legalnotice>
-            <para>
-                This work is licensed under the Creative Commons Attribution License.
-                To view a copy of this license, visit
-                <ulink url="http://creativecommons.org/licenses/by/2.5/">http://creativecommons.org/licenses/by/2.5/</ulink>
-                or send a letter to Creative Commons, 444 Castro Street,
-                Suite 900, Mountain View, California 94041, USA.
-            </para>
-        </legalnotice>
-    </bookinfo>
-
-    <xi:include href="user-manual-intro.xml"/>
-
-    <xi:include href="user-manual-metadata.xml"/>
-
-    <xi:include href="user-manual-fetching.xml"/>
-
-    <xi:include href="user-manual-bitbakecommand.xml"/>
-
-    <xi:include href="user-manual-ref-variables.xml"/>
-
-</book>

bitbake/lib/bb/COW.py

@@ -3,7 +3,7 @@
 #
 # This is a copy on write dictionary and set which abuses classes to try and be nice and fast.
 #
-# Copyright (C) 2006 Tim Amsell
+# Copyright (C) 2006 Tim Amsell 
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -18,31 +18,31 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-#Please Note:
+#Please Note: 
 # Be careful when using mutable types (ie Dict and Lists) - operations involving these are SLOW.
 # Assign a file to __warn__ to get warnings about slow operations.
 #
 
-from __future__ import print_function
+from inspect import getmro
+
 import copy
-import types
-ImmutableTypes = (
-    types.NoneType,
-    bool,
-    complex,
-    float,
-    int,
-    long,
-    tuple,
-    frozenset,
-    basestring
-)
+import types, sets
+types.ImmutableTypes = tuple([ \
+    types.BooleanType, \
+    types.ComplexType, \
+    types.FloatType, \
+    types.IntType, \
+    types.LongType, \
+    types.NoneType, \
+    types.TupleType, \
+    sets.ImmutableSet] + \
+    list(types.StringTypes))
 
 MUTABLE = "__mutable__"
 
 class COWMeta(type):
     pass
-
+ 
 class COWDictMeta(COWMeta):
     __warn__ = False
     __hasmutable__ = False
@@ -61,12 +61,12 @@ class COWDictMeta(COWMeta):
     __call__ = cow
 
     def __setitem__(cls, key, value):
-        if not isinstance(value, ImmutableTypes):
+        if not isinstance(value, types.ImmutableTypes):
             if not isinstance(value, COWMeta):
                 cls.__hasmutable__ = True
             key += MUTABLE
         setattr(cls, key, value)
-
+    
     def __getmutable__(cls, key, readonly=False):
         nkey = key + MUTABLE
         try:
@@ -79,10 +79,10 @@ class COWDictMeta(COWMeta):
             return value
 
         if not cls.__warn__ is False and not isinstance(value, COWMeta):
-            print("Warning: Doing a copy because %s is a mutable type." % key, file=cls.__warn__)
+            print >> cls.__warn__, "Warning: Doing a copy because %s is a mutable type." % key
         try:
             value = value.copy()
-        except AttributeError as e:
+        except AttributeError, e:
             value = copy.copy(value)
         setattr(cls, nkey, value)
         return value
@@ -100,13 +100,13 @@ class COWDictMeta(COWMeta):
                 value = getattr(cls, key)
             except AttributeError:
                 value = cls.__getmutable__(key, readonly)
-
-            # This is for values which have been deleted
+            
+            # This is for values which have been deleted 
             if value is cls.__marker__:
                 raise AttributeError("key %s does not exist." % key)
 
             return value
-        except AttributeError as e:
+        except AttributeError, e:
             if not default is cls.__getmarker__:
                 return default
 
@@ -120,9 +120,6 @@ class COWDictMeta(COWMeta):
             key += MUTABLE
         delattr(cls, key)
 
-    def __contains__(cls, key):
-        return cls.has_key(key)
-
     def has_key(cls, key):
         value = cls.__getreadonly__(key, cls.__marker__)
         if value is cls.__marker__:
@@ -132,7 +129,7 @@ class COWDictMeta(COWMeta):
     def iter(cls, type, readonly=False):
         for key in dir(cls):
             if key.startswith("__"):
-                continue
+                    continue
 
             if key.endswith(MUTABLE):
                 key = key[:-len(MUTABLE)]
@@ -158,11 +155,11 @@ class COWDictMeta(COWMeta):
         return cls.iter("keys")
     def itervalues(cls, readonly=False):
         if not cls.__warn__ is False and cls.__hasmutable__ and readonly is False:
-            print("Warning: If you arn't going to change any of the values call with True.", file=cls.__warn__)
+            print >> cls.__warn__, "Warning: If you arn't going to change any of the values call with True."
         return cls.iter("values", readonly)
     def iteritems(cls, readonly=False):
         if not cls.__warn__ is False and cls.__hasmutable__ and readonly is False:
-            print("Warning: If you arn't going to change any of the values call with True.", file=cls.__warn__)
+            print >> cls.__warn__, "Warning: If you arn't going to change any of the values call with True."
         return cls.iter("items", readonly)
 
 class COWSetMeta(COWDictMeta):
@@ -181,13 +178,13 @@ class COWSetMeta(COWDictMeta):
 
     def remove(cls, value):
         COWDictMeta.__delitem__(cls, repr(hash(value)))
-
+ 
     def __in__(cls, value):
         return COWDictMeta.has_key(repr(hash(value)))
 
     def iterkeys(cls):
         raise TypeError("sets don't have keys")
-
+    
     def iteritems(cls):
         raise TypeError("sets don't have 'items'")
 
@@ -204,120 +201,120 @@ if __name__ == "__main__":
     import sys
     COWDictBase.__warn__ = sys.stderr
     a = COWDictBase()
-    print("a", a)
+    print "a", a
 
     a['a'] = 'a'
     a['b'] = 'b'
     a['dict'] = {}
 
     b = a.copy()
-    print("b", b)
+    print "b", b
     b['c'] = 'b'
 
-    print()
+    print
 
-    print("a", a)
+    print "a", a
     for x in a.iteritems():
-        print(x)
-    print("--")
-    print("b", b)
+        print x
+    print "--"
+    print "b", b
     for x in b.iteritems():
-        print(x)
-    print()
+        print x
+    print
 
     b['dict']['a'] = 'b'
     b['a'] = 'c'
 
-    print("a", a)
+    print "a", a
     for x in a.iteritems():
-        print(x)
-    print("--")
-    print("b", b)
+        print x
+    print "--"
+    print "b", b
     for x in b.iteritems():
-        print(x)
-    print()
+        print x
+    print
 
     try:
         b['dict2']
-    except KeyError as e:
-        print("Okay!")
+    except KeyError, e:
+        print "Okay!"
 
     a['set'] = COWSetBase()
     a['set'].add("o1")
     a['set'].add("o1")
     a['set'].add("o2")
 
-    print("a", a)
+    print "a", a
     for x in a['set'].itervalues():
-        print(x)
-    print("--")
-    print("b", b)
+        print x
+    print "--"
+    print "b", b
     for x in b['set'].itervalues():
-        print(x)
-    print()
+        print x
+    print
 
     b['set'].add('o3')
 
-    print("a", a)
+    print "a", a
     for x in a['set'].itervalues():
-        print(x)
-    print("--")
-    print("b", b)
+        print x
+    print "--"
+    print "b", b
     for x in b['set'].itervalues():
-        print(x)
-    print()
+        print x
+    print
 
     a['set2'] = set()
     a['set2'].add("o1")
     a['set2'].add("o1")
     a['set2'].add("o2")
 
-    print("a", a)
+    print "a", a
     for x in a.iteritems():
-        print(x)
-    print("--")
-    print("b", b)
+        print x
+    print "--"
+    print "b", b
     for x in b.iteritems(readonly=True):
-        print(x)
-    print()
+        print x
+    print
 
     del b['b']
     try:
-        print(b['b'])
+        print b['b']
     except KeyError:
-        print("Yay! deleted key raises error")
+        print "Yay! deleted key raises error"
 
     if b.has_key('b'):
-        print("Boo!")
+        print "Boo!"
     else:
-        print("Yay - has_key with delete works!")
-
-    print("a", a)
+        print "Yay - has_key with delete works!"
+    
+    print "a", a
     for x in a.iteritems():
-        print(x)
-    print("--")
-    print("b", b)
+        print x
+    print "--"
+    print "b", b
     for x in b.iteritems(readonly=True):
-        print(x)
-    print()
+        print x
+    print
 
     b.__revertitem__('b')
 
-    print("a", a)
+    print "a", a
     for x in a.iteritems():
-        print(x)
-    print("--")
-    print("b", b)
+        print x
+    print "--"
+    print "b", b
     for x in b.iteritems(readonly=True):
-        print(x)
-    print()
+        print x
+    print
 
     b.__revertitem__('dict')
-    print("a", a)
+    print "a", a
     for x in a.iteritems():
-        print(x)
-    print("--")
-    print("b", b)
+        print x
+    print "--"
+    print "b", b
     for x in b.iteritems(readonly=True):
-        print(x)
-    print()
+        print x
+    print

bitbake/lib/bb/build.py

@@ -25,58 +25,25 @@
 #
 #Based on functions from the base bb module, Copyright 2003 Holger Schurig
 
-import os
-import sys
-import logging
-import shlex
-import glob
-import bb
-import bb.msg
-import bb.process
-from contextlib import nested
-from bb import event, utils
-
-bblogger = logging.getLogger('BitBake')
-logger = logging.getLogger('BitBake.Build')
-
-NULL = open(os.devnull, 'r+')
-
-
-# When we execute a python function we'd like certain things
-# in all namespaces, hence we add them to __builtins__
-# If we do not do this and use the exec globals, they will
-# not be available to subfunctions.
-__builtins__['bb'] = bb
-__builtins__['os'] = os
+from bb import data, fetch, event, mkdirhier, utils
+import bb, os
 
+# events
 class FuncFailed(Exception):
-    def __init__(self, name = None, logfile = None):
-        self.logfile = logfile
-        self.name = name
-        if name:
-            self.msg = 'Function failed: %s' % name
-        else:
-            self.msg = "Function failed"
+    """Executed function failed"""
 
-    def __str__(self):
-        if self.logfile and os.path.exists(self.logfile):
-            msg = ("%s (log file is located at %s)" %
-                   (self.msg, self.logfile))
-        else:
-            msg = self.msg
-        return msg
+class EventException(Exception):
+    """Exception which is associated with an Event."""
+
+    def __init__(self, msg, event):
+        self.args = msg, event
 
 class TaskBase(event.Event):
     """Base class for task events"""
 
-    def __init__(self, t, logfile, d):
+    def __init__(self, t, d ):
         self._task = t
-        self._package = d.getVar("PF", True)
-        self.taskfile = d.getVar("FILE", True)
-        self.taskname = self._task
-        self.logfile = logfile
-        event.Event.__init__(self)
-        self._message = "recipe %s: task %s: %s" % (d.getVar("PF", True), t, self.getDisplayName())
+        event.Event.__init__(self, d)
 
     def getTask(self):
         return self._task
@@ -84,16 +51,10 @@ class TaskBase(event.Event):
     def setTask(self, task):
         self._task = task
 
-    def getDisplayName(self):
-        return bb.event.getName(self)[4:]
-
     task = property(getTask, setTask, None, "task property")
 
 class TaskStarted(TaskBase):
     """Task execution started"""
-    def __init__(self, t, logfile, taskflags, d):
-        super(TaskStarted, self).__init__(t, logfile, d)
-        self.taskflags = taskflags
 
 class TaskSucceeded(TaskBase):
     """Task execution completed"""
@@ -101,533 +62,277 @@ class TaskSucceeded(TaskBase):
 class TaskFailed(TaskBase):
     """Task execution failed"""
 
-    def __init__(self, task, logfile, metadata, errprinted = False):
-        self.errprinted = errprinted
-        super(TaskFailed, self).__init__(task, logfile, metadata)
+class InvalidTask(TaskBase):
+    """Invalid Task"""
 
-class TaskFailedSilent(TaskBase):
-    """Task execution failed (silently)"""
-    def getDisplayName(self):
-        # Don't need to tell the user it was silent
-        return "Failed"
-
-class TaskInvalid(TaskBase):
-
-    def __init__(self, task, metadata):
-        super(TaskInvalid, self).__init__(task, None, metadata)
-        self._message = "No such task '%s'" % task
-
-
-class LogTee(object):
-    def __init__(self, logger, outfile):
-        self.outfile = outfile
-        self.logger = logger
-        self.name = self.outfile.name
-
-    def write(self, string):
-        self.logger.plain(string)
-        self.outfile.write(string)
-
-    def __enter__(self):
-        self.outfile.__enter__()
-        return self
-
-    def __exit__(self, *excinfo):
-        self.outfile.__exit__(*excinfo)
-
-    def __repr__(self):
-        return '<LogTee {0}>'.format(self.name)
-    def flush(self):
-        self.outfile.flush()
+# functions
 
 def exec_func(func, d, dirs = None):
     """Execute an BB 'function'"""
 
-    body = d.getVar(func)
+    body = data.getVar(func, d)
     if not body:
-        if body is None:
-            logger.warn("Function %s doesn't exist", func)
         return
 
-    flags = d.getVarFlags(func)
-    cleandirs = flags.get('cleandirs')
-    if cleandirs:
-        for cdir in d.expand(cleandirs).split():
-            bb.utils.remove(cdir, True)
-            bb.utils.mkdirhier(cdir)
+    flags = data.getVarFlags(func, d)
+    for item in ['deps', 'check', 'interactive', 'python', 'cleandirs', 'dirs', 'lockfiles', 'fakeroot']:
+        if not item in flags:
+            flags[item] = None
 
-    if dirs is None:
-        dirs = flags.get('dirs')
-        if dirs:
-            dirs = d.expand(dirs).split()
+    ispython = flags['python']
+
+    cleandirs = (data.expand(flags['cleandirs'], d) or "").split()
+    for cdir in cleandirs:
+        os.system("rm -rf %s" % cdir)
 
     if dirs:
-        for adir in dirs:
-            bb.utils.mkdirhier(adir)
+        dirs = data.expand(dirs, d)
+    else:
+        dirs = (data.expand(flags['dirs'], d) or "").split()
+    for adir in dirs:
+        mkdirhier(adir)
+
+    if len(dirs) > 0:
         adir = dirs[-1]
     else:
-        adir = d.getVar('B', True)
-        bb.utils.mkdirhier(adir)
-
-    ispython = flags.get('python')
-
-    lockflag = flags.get('lockfiles')
-    if lockflag:
-        lockfiles = [d.expand(f) for f in lockflag.split()]
-    else:
-        lockfiles = None
-
-    tempdir = d.getVar('T', True)
-
-    # or func allows items to be executed outside of the normal
-    # task set, such as buildhistory
-    task = d.getVar('BB_RUNTASK', True) or func
-    if task == func:
-        taskfunc = task
-    else:
-        taskfunc = "%s.%s" % (task, func)
-
-    runfmt = d.getVar('BB_RUNFMT', True) or "run.{func}.{pid}"
-    runfn = runfmt.format(taskfunc=taskfunc, task=task, func=func, pid=os.getpid())
-    runfile = os.path.join(tempdir, runfn)
-    bb.utils.mkdirhier(os.path.dirname(runfile))
-
-    # Setup the courtesy link to the runfn, only for tasks
-    # we create the link 'just' before the run script is created
-    # if we create it after, and if the run script fails, then the
-    # link won't be created as an exception would be fired.
-    if task == func:
-        runlink = os.path.join(tempdir, 'run.{0}'.format(task))
-        if runlink:
-            bb.utils.remove(runlink)
-
-            try:
-                os.symlink(runfn, runlink)
-            except OSError:
-                pass
-
-    with bb.utils.fileslocked(lockfiles):
-        if ispython:
-            exec_func_python(func, d, runfile, cwd=adir)
-        else:
-            exec_func_shell(func, d, runfile, cwd=adir)
-
-_functionfmt = """
-def {function}(d):
-{body}
-
-{function}(d)
-"""
-logformatter = bb.msg.BBLogFormatter("%(levelname)s: %(message)s")
-def exec_func_python(func, d, runfile, cwd=None):
-    """Execute a python BB 'function'"""
-
-    bbfile = d.getVar('FILE', True)
-    code = _functionfmt.format(function=func, body=d.getVar(func, True))
-    bb.utils.mkdirhier(os.path.dirname(runfile))
-    with open(runfile, 'w') as script:
-        script.write(code)
-
-    if cwd:
-        try:
-            olddir = os.getcwd()
-        except OSError:
-            olddir = None
-        os.chdir(cwd)
-
-    bb.debug(2, "Executing python function %s" % func)
+        adir = data.getVar('B', d, 1)
 
     try:
-        comp = utils.better_compile(code, func, bbfile)
-        utils.better_exec(comp, {"d": d}, code, bbfile)
-    except:
-        if sys.exc_info()[0] in (bb.parse.SkipPackage, bb.build.FuncFailed):
-            raise
+        prevdir = os.getcwd()
+    except OSError:
+        prevdir = data.getVar('TOPDIR', d, True)
+    if adir and os.access(adir, os.F_OK):
+        os.chdir(adir)
 
-        raise FuncFailed(func, None)
-    finally:
-        bb.debug(2, "Python function %s finished" % func)
+    locks = []
+    lockfiles = (data.expand(flags['lockfiles'], d) or "").split()
+    for lock in lockfiles:
+        locks.append(bb.utils.lockfile(lock))
 
-        if cwd and olddir:
-            try:
-                os.chdir(olddir)
-            except OSError:
-                pass
+    if flags['python']:
+        exec_func_python(func, d)
+    else:
+        exec_func_shell(func, d, flags)
 
-def shell_trap_code():
-    return '''#!/bin/sh\n
-# Emit a useful diagnostic if something fails:
-bb_exit_handler() {
-    ret=$?
-    case $ret in
-    0)  ;;
-    *)  case $BASH_VERSION in
-        "")   echo "WARNING: exit code $ret from a shell command.";;
-        *)    echo "WARNING: ${BASH_SOURCE[0]}:${BASH_LINENO[0]} exit $ret from
-  \"$BASH_COMMAND\"";;
-        esac
-        exit $ret
-    esac
-}
-trap 'bb_exit_handler' 0
-set -e
-'''
+    for lock in locks:
+        bb.utils.unlockfile(lock)
 
-def exec_func_shell(func, d, runfile, cwd=None):
-    """Execute a shell function from the metadata
+    if os.path.exists(prevdir):
+        os.chdir(prevdir)
+
+def exec_func_python(func, d):
+    """Execute a python BB 'function'"""
+    import re, os
+
+    bbfile = bb.data.getVar('FILE', d, 1)
+    tmp  = "def " + func + "():\n%s" % data.getVar(func, d)
+    tmp += '\n' + func + '()'
+    comp = utils.better_compile(tmp, func, bbfile)
+    prevdir = os.getcwd()
+    g = {} # globals
+    g['bb'] = bb
+    g['os'] = os
+    g['d'] = d
+    utils.better_exec(comp, g, tmp, bbfile)
+    if os.path.exists(prevdir):
+        os.chdir(prevdir)
+
+def exec_func_shell(func, d, flags):
+    """Execute a shell BB 'function' Returns true if execution was successful.
+
+    For this, it creates a bash shell script in the tmp dectory, writes the local
+    data into it and finally executes. The output of the shell will end in a log file and stdout.
 
     Note on directory behavior.  The 'dirs' varflag should contain a list
     of the directories you need created prior to execution.  The last
     item in the list is where we will chdir/cd to.
     """
+    import sys
 
-    # Don't let the emitted shell script override PWD
-    d.delVarFlag('PWD', 'export')
+    deps = flags['deps']
+    check = flags['check']
+    interact = flags['interactive']
+    if check in globals():
+        if globals()[check](func, deps):
+            return
 
-    with open(runfile, 'w') as script:
-        script.write(shell_trap_code())
+    global logfile
+    t = data.getVar('T', d, 1)
+    if not t:
+        return 0
+    mkdirhier(t)
+    logfile = "%s/log.%s.%s" % (t, func, str(os.getpid()))
+    runfile = "%s/run.%s.%s" % (t, func, str(os.getpid()))
 
-        bb.data.emit_func(func, script, d)
-
-        if bb.msg.loggerVerboseLogs:
-            script.write("set -x\n")
-        if cwd:
-            script.write("cd '%s'\n" % cwd)
-        script.write("%s\n" % func)
-        script.write('''
-# cleanup
-ret=$?
-trap '' 0
-exit $?
-''')
+    f = open(runfile, "w")
+    f.write("#!/bin/sh -e\n")
+    if bb.msg.debug_level['default'] > 0: f.write("set -x\n")
+    data.emit_env(f, d)
 
+    f.write("cd %s\n" % os.getcwd())
+    if func: f.write("%s\n" % func)
+    f.close()
     os.chmod(runfile, 0775)
+    if not func:
+        bb.msg.error(bb.msg.domain.Build, "Function not specified")
+        raise FuncFailed()
 
-    cmd = runfile
-    if d.getVarFlag(func, 'fakeroot'):
-        fakerootcmd = d.getVar('FAKEROOT', True)
-        if fakerootcmd:
-            cmd = [fakerootcmd, runfile]
-
-    if bb.msg.loggerDefaultVerbose:
-        logfile = LogTee(logger, sys.stdout)
-    else:
-        logfile = sys.stdout
-
-    bb.debug(2, "Executing shell function %s" % func)
-
+    # open logs
+    si = file('/dev/null', 'r')
     try:
-        with open(os.devnull, 'r+') as stdin:
-            bb.process.run(cmd, shell=False, stdin=stdin, log=logfile)
-    except bb.process.CmdError:
-        logfn = d.getVar('BB_LOGFILE', True)
-        raise FuncFailed(func, logfn)
-
-    bb.debug(2, "Shell function %s finished" % func)
-
-def _task_data(fn, task, d):
-    localdata = bb.data.createCopy(d)
-    localdata.setVar('BB_FILENAME', fn)
-    localdata.setVar('BB_CURRENTTASK', task[3:])
-    localdata.setVar('OVERRIDES', 'task-%s:%s' %
-                     (task[3:].replace('_', '-'), d.getVar('OVERRIDES', False)))
-    localdata.finalize()
-    bb.data.expandKeys(localdata)
-    return localdata
-
-def _exec_task(fn, task, d, quieterr):
-    """Execute a BB 'task'
-
-    Execution of a task involves a bit more setup than executing a function,
-    running it with its own local metadata, and with some useful variables set.
-    """
-    if not d.getVarFlag(task, 'task'):
-        event.fire(TaskInvalid(task, d), d)
-        logger.error("No such task: %s" % task)
-        return 1
-
-    logger.debug(1, "Executing task %s", task)
-
-    localdata = _task_data(fn, task, d)
-    tempdir = localdata.getVar('T', True)
-    if not tempdir:
-        bb.fatal("T variable not set, unable to build")
-
-    # Change nice level if we're asked to
-    nice = localdata.getVar("BB_TASK_NICE_LEVEL", True)
-    if nice:
-        curnice = os.nice(0)
-        nice = int(nice) - curnice
-        newnice = os.nice(nice)
-        logger.debug(1, "Renice to %s " % newnice)
-
-    bb.utils.mkdirhier(tempdir)
-
-    # Determine the logfile to generate
-    logfmt = localdata.getVar('BB_LOGFMT', True) or 'log.{task}.{pid}'
-    logbase = logfmt.format(task=task, pid=os.getpid())
-
-    # Document the order of the tasks...
-    logorder = os.path.join(tempdir, 'log.task_order')
-    try:
-        with open(logorder, 'a') as logorderfile:
-            logorderfile.write('{0} ({1}): {2}\n'.format(task, os.getpid(), logbase))
-    except OSError:
-        logger.exception("Opening log file '%s'", logorder)
-        pass
-
-    # Setup the courtesy link to the logfn
-    loglink = os.path.join(tempdir, 'log.{0}'.format(task))
-    logfn = os.path.join(tempdir, logbase)
-    if loglink:
-        bb.utils.remove(loglink)
-
-        try:
-           os.symlink(logbase, loglink)
-        except OSError:
-           pass
-
-    prefuncs = localdata.getVarFlag(task, 'prefuncs', expand=True)
-    postfuncs = localdata.getVarFlag(task, 'postfuncs', expand=True)
-
-    class ErrorCheckHandler(logging.Handler):
-        def __init__(self):
-            self.triggered = False
-            logging.Handler.__init__(self, logging.ERROR)
-        def emit(self, record):
-            self.triggered = True
-
-    # Handle logfiles
-    si = open('/dev/null', 'r')
-    try:
-        bb.utils.mkdirhier(os.path.dirname(logfn))
-        logfile = open(logfn, 'w')
-    except OSError:
-        logger.exception("Opening log file '%s'", logfn)
-        pass
-
-    # Dup the existing fds so we dont lose them
-    osi = [os.dup(sys.stdin.fileno()), sys.stdin.fileno()]
-    oso = [os.dup(sys.stdout.fileno()), sys.stdout.fileno()]
-    ose = [os.dup(sys.stderr.fileno()), sys.stderr.fileno()]
-
-    # Replace those fds with our own
-    os.dup2(si.fileno(), osi[1])
-    os.dup2(logfile.fileno(), oso[1])
-    os.dup2(logfile.fileno(), ose[1])
-
-    # Ensure python logging goes to the logfile
-    handler = logging.StreamHandler(logfile)
-    handler.setFormatter(logformatter)
-    # Always enable full debug output into task logfiles
-    handler.setLevel(logging.DEBUG - 2)
-    bblogger.addHandler(handler)
-
-    errchk = ErrorCheckHandler()
-    bblogger.addHandler(errchk)
-
-    localdata.setVar('BB_LOGFILE', logfn)
-    localdata.setVar('BB_RUNTASK', task)
-
-    flags = localdata.getVarFlags(task)
-
-    event.fire(TaskStarted(task, logfn, flags, localdata), localdata)
-    try:
-        for func in (prefuncs or '').split():
-            exec_func(func, localdata)
-        exec_func(task, localdata)
-        for func in (postfuncs or '').split():
-            exec_func(func, localdata)
-    except FuncFailed as exc:
-        if quieterr:
-            event.fire(TaskFailedSilent(task, logfn, localdata), localdata)
+        if bb.msg.debug_level['default'] > 0:
+            so = os.popen("tee \"%s\"" % logfile, "w")
         else:
-            errprinted = errchk.triggered
-            logger.error(str(exc))
-            event.fire(TaskFailed(task, logfn, localdata, errprinted), localdata)
-        return 1
-    finally:
-        sys.stdout.flush()
-        sys.stderr.flush()
+            so = file(logfile, 'w')
+    except OSError, e:
+        bb.msg.error(bb.msg.domain.Build, "opening log file: %s" % e)
+        pass
 
-        bblogger.removeHandler(handler)
+    se = so
 
-        # Restore the backup fds
+    if not interact:
+        # dup the existing fds so we dont lose them
+        osi = [os.dup(sys.stdin.fileno()), sys.stdin.fileno()]
+        oso = [os.dup(sys.stdout.fileno()), sys.stdout.fileno()]
+        ose = [os.dup(sys.stderr.fileno()), sys.stderr.fileno()]
+
+        # replace those fds with our own
+        os.dup2(si.fileno(), osi[1])
+        os.dup2(so.fileno(), oso[1])
+        os.dup2(se.fileno(), ose[1])
+
+    # execute function
+    prevdir = os.getcwd()
+    if flags['fakeroot']:
+        maybe_fakeroot = "PATH=\"%s\" fakeroot " % bb.data.getVar("PATH", d, 1)
+    else:
+        maybe_fakeroot = ''
+    lang_environment = "LC_ALL=C "
+    ret = os.system('%s%ssh -e %s' % (lang_environment, maybe_fakeroot, runfile))
+    try:
+        os.chdir(prevdir)
+    except:
+        pass
+
+    if not interact:
+        # restore the backups
         os.dup2(osi[0], osi[1])
         os.dup2(oso[0], oso[1])
         os.dup2(ose[0], ose[1])
 
-        # Close the backup fds
+        # close our logs
+        si.close()
+        so.close()
+        se.close()
+
+        # close the backup fds
         os.close(osi[0])
         os.close(oso[0])
         os.close(ose[0])
-        si.close()
 
-        logfile.close()
-        if os.path.exists(logfn) and os.path.getsize(logfn) == 0:
-            logger.debug(2, "Zero size logfn %s, removing", logfn)
-            bb.utils.remove(logfn)
-            bb.utils.remove(loglink)
-    event.fire(TaskSucceeded(task, logfn, localdata), localdata)
-
-    if not localdata.getVarFlag(task, 'nostamp') and not localdata.getVarFlag(task, 'selfstamp'):
-        make_stamp(task, localdata)
-
-    return 0
-
-def exec_task(fn, task, d, profile = False):
-    try:
-        quieterr = False
-        if d.getVarFlag(task, "quieterrors") is not None:
-            quieterr = True
-
-        if profile:
-            profname = "profile-%s.log" % (d.getVar("PN", True) + "-" + task)
-            try:
-                import cProfile as profile
-            except:
-                import profile
-            prof = profile.Profile()
-            ret = profile.Profile.runcall(prof, _exec_task, fn, task, d, quieterr)
-            prof.dump_stats(profname)
-            bb.utils.process_profilelog(profname)
-
-            return ret
+    if ret==0:
+        if bb.msg.debug_level['default'] > 0:
+            os.remove(runfile)
+#            os.remove(logfile)
+        return
+    else:
+        bb.msg.error(bb.msg.domain.Build, "function %s failed" % func)
+        if data.getVar("BBINCLUDELOGS", d):
+            bb.msg.error(bb.msg.domain.Build, "log data follows (%s)" % logfile)
+            number_of_lines = data.getVar("BBINCLUDELOGS_LINES", d)
+            if number_of_lines:
+                os.system('tail -n%s %s' % (number_of_lines, logfile))
+            else:
+                f = open(logfile, "r")
+                while True:
+                    l = f.readline()
+                    if l == '':
+                        break
+                    l = l.rstrip()
+                    print '| %s' % l
+                f.close()
         else:
-            return _exec_task(fn, task, d, quieterr)
+            bb.msg.error(bb.msg.domain.Build, "see log in %s" % logfile)
+        raise FuncFailed( logfile )
 
-    except Exception:
-        from traceback import format_exc
-        if not quieterr:
-            logger.error("Build of %s failed" % (task))
-            logger.error(format_exc())
-            failedevent = TaskFailed(task, None, d, True)
-            event.fire(failedevent, d)
-        return 1
 
-def stamp_internal(taskname, d, file_name):
+def exec_task(task, d):
+    """Execute an BB 'task'
+
+       The primary difference between executing a task versus executing
+       a function is that a task exists in the task digraph, and therefore
+       has dependencies amongst other tasks."""
+
+    # Check whther this is a valid task
+    if not data.getVarFlag(task, 'task', d):
+        raise EventException("No such task", InvalidTask(task, d))
+
+    try:
+        bb.msg.debug(1, bb.msg.domain.Build, "Executing task %s" % task)
+        old_overrides = data.getVar('OVERRIDES', d, 0)
+        localdata = data.createCopy(d)
+        data.setVar('OVERRIDES', 'task-%s:%s' % (task[3:], old_overrides), localdata)
+        data.update_data(localdata)
+        data.expandKeys(localdata)
+        event.fire(TaskStarted(task, localdata))
+        exec_func(task, localdata)
+        event.fire(TaskSucceeded(task, localdata))
+    except FuncFailed, reason:
+        bb.msg.note(1, bb.msg.domain.Build, "Task failed: %s" % reason )
+        failedevent = TaskFailed(task, d)
+        event.fire(failedevent)
+        raise EventException("Function failed in task: %s" % reason, failedevent)
+
+    # make stamp, or cause event and raise exception
+    if not data.getVarFlag(task, 'nostamp', d) and not data.getVarFlag(task, 'selfstamp', d):
+        make_stamp(task, d)
+
+def extract_stamp(d, fn):
+    """
+    Extracts stamp format which is either a data dictonary (fn unset) 
+    or a dataCache entry (fn set). 
+    """
+    if fn:
+        return d.stamp[fn]
+    return data.getVar('STAMP', d, 1)
+
+def stamp_internal(task, d, file_name):
     """
     Internal stamp helper function
+    Removes any stamp for the given task
     Makes sure the stamp directory exists
     Returns the stamp path+filename
-
-    In the bitbake core, d can be a CacheData and file_name will be set.
-    When called in task context, d will be a data store, file_name will not be set
     """
-    taskflagname = taskname
-    if taskname.endswith("_setscene") and taskname != "do_setscene":
-        taskflagname = taskname.replace("_setscene", "")
-
-    if file_name:
-        stamp = d.stamp_base[file_name].get(taskflagname) or d.stamp[file_name]
-        extrainfo = d.stamp_extrainfo[file_name].get(taskflagname) or ""
-    else:
-        stamp = d.getVarFlag(taskflagname, 'stamp-base', True) or d.getVar('STAMP', True)
-        file_name = d.getVar('BB_FILENAME', True)
-        extrainfo = d.getVarFlag(taskflagname, 'stamp-extra-info', True) or ""
-
+    stamp = extract_stamp(d, file_name)
     if not stamp:
         return
-
-    stamp = bb.parse.siggen.stampfile(stamp, file_name, taskname, extrainfo)
-
-    stampdir = os.path.dirname(stamp)
-    if bb.parse.cached_mtime_noerror(stampdir) == 0:
-        bb.utils.mkdirhier(stampdir)
-
+    stamp = "%s.%s" % (stamp, task)
+    mkdirhier(os.path.dirname(stamp))
+    # Remove the file and recreate to force timestamp
+    # change on broken NFS filesystems
+    if os.access(stamp, os.F_OK):
+        os.remove(stamp)
     return stamp
 
-def stamp_cleanmask_internal(taskname, d, file_name):
-    """
-    Internal stamp helper function to generate stamp cleaning mask
-    Returns the stamp path+filename
-
-    In the bitbake core, d can be a CacheData and file_name will be set.
-    When called in task context, d will be a data store, file_name will not be set
-    """
-    taskflagname = taskname
-    if taskname.endswith("_setscene") and taskname != "do_setscene":
-        taskflagname = taskname.replace("_setscene", "")
-
-    if file_name:
-        stamp = d.stamp_base_clean[file_name].get(taskflagname) or d.stampclean[file_name]
-        extrainfo = d.stamp_extrainfo[file_name].get(taskflagname) or ""
-    else:
-        stamp = d.getVarFlag(taskflagname, 'stamp-base-clean', True) or d.getVar('STAMPCLEAN', True)
-        file_name = d.getVar('BB_FILENAME', True)
-        extrainfo = d.getVarFlag(taskflagname, 'stamp-extra-info', True) or ""
-
-    if not stamp:
-        return []
-
-    cleanmask = bb.parse.siggen.stampcleanmask(stamp, file_name, taskname, extrainfo)
-
-    return [cleanmask, cleanmask.replace(taskflagname, taskflagname + "_setscene")]
-
 def make_stamp(task, d, file_name = None):
     """
     Creates/updates a stamp for a given task
     (d can be a data dict or dataCache)
     """
-    cleanmask = stamp_cleanmask_internal(task, d, file_name)
-    for mask in cleanmask:
-        for name in glob.glob(mask):
-            # Preserve sigdata files in the stamps directory
-            if "sigdata" in name:
-                continue
-            # Preserve taint files in the stamps directory
-            if name.endswith('.taint'):
-                continue
-            os.unlink(name)
-
     stamp = stamp_internal(task, d, file_name)
-    # Remove the file and recreate to force timestamp
-    # change on broken NFS filesystems
     if stamp:
-        bb.utils.remove(stamp)
-        open(stamp, "w").close()
-
-    # If we're in task context, write out a signature file for each task
-    # as it completes
-    if not task.endswith("_setscene") and task != "do_setscene" and not file_name:
-        file_name = d.getVar('BB_FILENAME', True)
-        bb.parse.siggen.dump_sigtask(file_name, task, d.getVar('STAMP', True), True)
+        f = open(stamp, "w")
+        f.close()
 
 def del_stamp(task, d, file_name = None):
     """
     Removes a stamp for a given task
     (d can be a data dict or dataCache)
     """
-    stamp = stamp_internal(task, d, file_name)
-    bb.utils.remove(stamp)
+    stamp_internal(task, d, file_name)
 
-def write_taint(task, d, file_name = None):
-    """
-    Creates a "taint" file which will force the specified task and its
-    dependents to be re-run the next time by influencing the value of its
-    taskhash.
-    (d can be a data dict or dataCache)
-    """
-    import uuid
-    if file_name:
-        taintfn = d.stamp[file_name] + '.' + task + '.taint'
-    else:
-        taintfn = d.getVar('STAMP', True) + '.' + task + '.taint'
-    bb.utils.mkdirhier(os.path.dirname(taintfn))
-    # The specific content of the taint file is not really important,
-    # we just need it to be random, so a random UUID is used
-    with open(taintfn, 'w') as taintf:
-        taintf.write(str(uuid.uuid4()))
-
-def stampfile(taskname, d, file_name = None):
-    """
-    Return the stamp for a given task
-    (d can be a data dict or dataCache)
-    """
-    return stamp_internal(taskname, d, file_name)
-
-def add_tasks(tasklist, deltasklist, d):
-    task_deps = d.getVar('_task_deps')
+def add_tasks(tasklist, d):
+    task_deps = data.getVar('_task_deps', d)
     if not task_deps:
         task_deps = {}
     if not 'tasks' in task_deps:
@@ -636,72 +341,36 @@ def add_tasks(tasklist, deltasklist, d):
         task_deps['parents'] = {}
 
     for task in tasklist:
-        task = d.expand(task)
-
-        if task in deltasklist:
-            continue
-
-        d.setVarFlag(task, 'task', 1)
+        task = data.expand(task, d)
+        data.setVarFlag(task, 'task', 1, d)
 
         if not task in task_deps['tasks']:
             task_deps['tasks'].append(task)
 
-        flags = d.getVarFlags(task)
+        flags = data.getVarFlags(task, d)    
         def getTask(name):
             if not name in task_deps:
                 task_deps[name] = {}
             if name in flags:
-                deptask = d.expand(flags[name])
+                deptask = data.expand(flags[name], d)
                 task_deps[name][task] = deptask
         getTask('depends')
-        getTask('rdepends')
         getTask('deptask')
         getTask('rdeptask')
         getTask('recrdeptask')
-        getTask('recideptask')
         getTask('nostamp')
-        getTask('fakeroot')
-        getTask('noexec')
-        getTask('umask')
         task_deps['parents'][task] = []
-        if 'deps' in flags:
-            for dep in flags['deps']:
-                dep = d.expand(dep)
-                task_deps['parents'][task].append(dep)
+        for dep in flags['deps']:
+            dep = data.expand(dep, d)
+            task_deps['parents'][task].append(dep)
 
     # don't assume holding a reference
-    d.setVar('_task_deps', task_deps)
+    data.setVar('_task_deps', task_deps, d)
 
-def addtask(task, before, after, d):
-    if task[:3] != "do_":
-        task = "do_" + task
+def remove_task(task, kill, d):
+    """Remove an BB 'task'.
 
-    d.setVarFlag(task, "task", 1)
-    bbtasks = d.getVar('__BBTASKS') or []
-    if not task in bbtasks:
-        bbtasks.append(task)
-    d.setVar('__BBTASKS', bbtasks)
+       If kill is 1, also remove tasks that depend on this task."""
 
-    existing = d.getVarFlag(task, "deps") or []
-    if after is not None:
-        # set up deps for function
-        for entry in after.split():
-            if entry not in existing:
-                existing.append(entry)
-    d.setVarFlag(task, "deps", existing)
-    if before is not None:
-        # set up things that depend on this func
-        for entry in before.split():
-            existing = d.getVarFlag(entry, "deps") or []
-            if task not in existing:
-                d.setVarFlag(entry, "deps", [task] + existing)
-
-def deltask(task, d):
-    if task[:3] != "do_":
-        task = "do_" + task
-
-    bbtasks = d.getVar('__BBDELTASKS') or []
-    if not task in bbtasks:
-        bbtasks.append(task)
-    d.setVar('__BBDELTASKS', bbtasks)
+    data.delVarFlag(task, 'task', d)
 

bitbake/lib/bb/cache_extra.py

@@ -1,75 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-#
-# Extra RecipeInfo will be all defined in this file. Currently,
-# Only Hob (Image Creator) Requests some extra fields. So
-# HobRecipeInfo is defined. It's named HobRecipeInfo because it
-# is introduced by 'hob'. Users could also introduce other
-# RecipeInfo or simply use those already defined RecipeInfo.
-# In the following patch, this newly defined new extra RecipeInfo
-# will be dynamically loaded and used for loading/saving the extra
-# cache fields  
-
-# Copyright (C) 2011, Intel Corporation. All rights reserved.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-from bb.cache import RecipeInfoCommon
-
-class HobRecipeInfo(RecipeInfoCommon):
-    __slots__ = ()
-
-    classname = "HobRecipeInfo"
-    # please override this member with the correct data cache file
-    # such as (bb_cache.dat, bb_extracache_hob.dat) 
-    cachefile = "bb_extracache_" + classname +".dat"        
-
-    # override this member with the list of extra cache fields
-    # that this class will provide
-    cachefields = ['summary', 'license', 'section',
-            'description', 'homepage', 'bugtracker',
-            'prevision', 'files_info']
-
-    def __init__(self, filename, metadata):
-
-        self.summary = self.getvar('SUMMARY', metadata)
-        self.license = self.getvar('LICENSE', metadata)
-        self.section = self.getvar('SECTION', metadata)
-        self.description = self.getvar('DESCRIPTION', metadata)
-        self.homepage = self.getvar('HOMEPAGE', metadata)
-        self.bugtracker = self.getvar('BUGTRACKER', metadata)
-        self.prevision = self.getvar('PR', metadata)
-        self.files_info = self.getvar('FILES_INFO', metadata)
-
-    @classmethod
-    def init_cacheData(cls, cachedata):
-        # CacheData in Hob RecipeInfo Class
-        cachedata.summary = {}
-        cachedata.license = {}
-        cachedata.section = {}
-        cachedata.description = {}
-        cachedata.homepage = {}
-        cachedata.bugtracker = {}
-        cachedata.prevision = {}
-        cachedata.files_info = {}
-
-    def add_cacheData(self, cachedata, fn):
-        cachedata.summary[fn] = self.summary
-        cachedata.license[fn] = self.license
-        cachedata.section[fn] = self.section
-        cachedata.description[fn] = self.description
-        cachedata.homepage[fn] = self.homepage
-        cachedata.bugtracker[fn] = self.bugtracker
-        cachedata.prevision[fn] = self.prevision
-        cachedata.files_info[fn] = self.files_info

bitbake/lib/bb/checksum.py

@@ -1,90 +0,0 @@
-# Local file checksum cache implementation
-#
-# Copyright (C) 2012 Intel Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import os
-import stat
-import bb.utils
-import logging
-from bb.cache import MultiProcessCache
-
-logger = logging.getLogger("BitBake.Cache")
-
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
-    logger.info("Importing cPickle failed. "
-                "Falling back to a very slow implementation.")
-
-
-# mtime cache (non-persistent)
-# based upon the assumption that files do not change during bitbake run
-class FileMtimeCache(object):
-    cache = {}
-
-    def cached_mtime(self, f):
-        if f not in self.cache:
-            self.cache[f] = os.stat(f)[stat.ST_MTIME]
-        return self.cache[f]
-
-    def cached_mtime_noerror(self, f):
-        if f not in self.cache:
-            try:
-                self.cache[f] = os.stat(f)[stat.ST_MTIME]
-            except OSError:
-                return 0
-        return self.cache[f]
-
-    def update_mtime(self, f):
-        self.cache[f] = os.stat(f)[stat.ST_MTIME]
-        return self.cache[f]
-
-    def clear(self):
-        self.cache.clear()
-
-# Checksum + mtime cache (persistent)
-class FileChecksumCache(MultiProcessCache):
-    cache_file_name = "local_file_checksum_cache.dat"
-    CACHE_VERSION = 1
-
-    def __init__(self):
-        self.mtime_cache = FileMtimeCache()
-        MultiProcessCache.__init__(self)
-
-    def get_checksum(self, f):
-        entry = self.cachedata[0].get(f)
-        cmtime = self.mtime_cache.cached_mtime(f)
-        if entry:
-            (mtime, hashval) = entry
-            if cmtime == mtime:
-                return hashval
-            else:
-                bb.debug(2, "file %s changed mtime, recompute checksum" % f)
-
-        hashval = bb.utils.md5_file(f)
-        self.cachedata_extras[0][f] = (cmtime, hashval)
-        return hashval
-
-    def merge_data(self, source, dest):
-        for h in source[0]:
-            if h in dest:
-                (smtime, _) = source[0][h]
-                (dmtime, _) = dest[0][h]
-                if smtime > dmtime:
-                    dest[0][h] = source[0][h]
-            else:
-                dest[0][h] = source[0][h]

bitbake/lib/bb/codeparser.py

@@ -1,328 +0,0 @@
-import ast
-import codegen
-import logging
-import os.path
-import bb.utils, bb.data
-from itertools import chain
-from pysh import pyshyacc, pyshlex, sherrors
-from bb.cache import MultiProcessCache
-
-
-logger = logging.getLogger('BitBake.CodeParser')
-
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
-    logger.info('Importing cPickle failed.  Falling back to a very slow implementation.')
-
-
-def check_indent(codestr):
-    """If the code is indented, add a top level piece of code to 'remove' the indentation"""
-
-    i = 0
-    while codestr[i] in ["\n", "\t", " "]:
-        i = i + 1
-
-    if i == 0:
-        return codestr
-
-    if codestr[i-1] == "\t" or codestr[i-1] == " ":
-        return "if 1:\n" + codestr
-
-    return codestr
-
-
-class CodeParserCache(MultiProcessCache):
-    cache_file_name = "bb_codeparser.dat"
-    CACHE_VERSION = 4
-
-    def __init__(self):
-        MultiProcessCache.__init__(self)
-        self.pythoncache = self.cachedata[0]
-        self.shellcache = self.cachedata[1]
-        self.pythoncacheextras = self.cachedata_extras[0]
-        self.shellcacheextras = self.cachedata_extras[1]
-
-    def init_cache(self, d):
-        MultiProcessCache.init_cache(self, d)
-
-        # cachedata gets re-assigned in the parent
-        self.pythoncache = self.cachedata[0]
-        self.shellcache = self.cachedata[1]
-
-    def compress_keys(self, data):
-        # When the dicts are originally created, python calls intern() on the set keys
-        # which significantly improves memory usage. Sadly the pickle/unpickle process
-        # doesn't call intern() on the keys and results in the same strings being duplicated
-        # in memory. This also means pickle will save the same string multiple times in
-        # the cache file. By interning the data here, the cache file shrinks dramatically
-        # meaning faster load times and the reloaded cache files also consume much less
-        # memory. This is worth any performance hit from this loops and the use of the
-        # intern() data storage.
-        # Python 3.x may behave better in this area
-        for h in data[0]:
-            data[0][h]["refs"] = self.internSet(data[0][h]["refs"])
-            data[0][h]["execs"] = self.internSet(data[0][h]["execs"])
-            for k in data[0][h]["contains"]:
-                data[0][h]["contains"][k] = self.internSet(data[0][h]["contains"][k])
-        for h in data[1]:
-            data[1][h]["execs"] = self.internSet(data[1][h]["execs"])
-        return
-
-    def create_cachedata(self):
-        data = [{}, {}]
-        return data
-
-codeparsercache = CodeParserCache()
-
-def parser_cache_init(d):
-    codeparsercache.init_cache(d)
-
-def parser_cache_save(d):
-    codeparsercache.save_extras(d)
-
-def parser_cache_savemerge(d):
-    codeparsercache.save_merge(d)
-
-Logger = logging.getLoggerClass()
-class BufferedLogger(Logger):
-    def __init__(self, name, level=0, target=None):
-        Logger.__init__(self, name)
-        self.setLevel(level)
-        self.buffer = []
-        self.target = target
-
-    def handle(self, record):
-        self.buffer.append(record)
-
-    def flush(self):
-        for record in self.buffer:
-            self.target.handle(record)
-        self.buffer = []
-
-class PythonParser():
-    getvars = ("d.getVar", "bb.data.getVar", "data.getVar", "d.appendVar", "d.prependVar")
-    containsfuncs = ("bb.utils.contains", "base_contains", "oe.utils.contains")
-    execfuncs = ("bb.build.exec_func", "bb.build.exec_task")
-
-    def warn(self, func, arg):
-        """Warn about calls of bitbake APIs which pass a non-literal
-        argument for the variable name, as we're not able to track such
-        a reference.
-        """
-
-        try:
-            funcstr = codegen.to_source(func)
-            argstr = codegen.to_source(arg)
-        except TypeError:
-            self.log.debug(2, 'Failed to convert function and argument to source form')
-        else:
-            self.log.debug(1, self.unhandled_message % (funcstr, argstr))
-
-    def visit_Call(self, node):
-        name = self.called_node_name(node.func)
-        if name in self.getvars or name in self.containsfuncs:
-            if isinstance(node.args[0], ast.Str):
-                varname = node.args[0].s
-                if name in self.containsfuncs and isinstance(node.args[1], ast.Str):
-                    if varname not in self.contains:
-                        self.contains[varname] = set()
-                    self.contains[varname].add(node.args[1].s)
-                else:                      
-                    self.references.add(node.args[0].s)
-            else:
-                self.warn(node.func, node.args[0])
-        elif name in self.execfuncs:
-            if isinstance(node.args[0], ast.Str):
-                self.var_execs.add(node.args[0].s)
-            else:
-                self.warn(node.func, node.args[0])
-        elif name and isinstance(node.func, (ast.Name, ast.Attribute)):
-            self.execs.add(name)
-
-    def called_node_name(self, node):
-        """Given a called node, return its original string form"""
-        components = []
-        while node:
-            if isinstance(node, ast.Attribute):
-                components.append(node.attr)
-                node = node.value
-            elif isinstance(node, ast.Name):
-                components.append(node.id)
-                return '.'.join(reversed(components))
-            else:
-                break
-
-    def __init__(self, name, log):
-        self.var_execs = set()
-        self.contains = {}
-        self.execs = set()
-        self.references = set()
-        self.log = BufferedLogger('BitBake.Data.PythonParser', logging.DEBUG, log)
-
-        self.unhandled_message = "in call of %s, argument '%s' is not a string literal"
-        self.unhandled_message = "while parsing %s, %s" % (name, self.unhandled_message)
-
-    def parse_python(self, node):
-        h = hash(str(node))
-
-        if h in codeparsercache.pythoncache:
-            self.references = codeparsercache.pythoncache[h]["refs"]
-            self.execs = codeparsercache.pythoncache[h]["execs"]
-            self.contains = codeparsercache.pythoncache[h]["contains"]
-            return
-
-        if h in codeparsercache.pythoncacheextras:
-            self.references = codeparsercache.pythoncacheextras[h]["refs"]
-            self.execs = codeparsercache.pythoncacheextras[h]["execs"]
-            self.contains = codeparsercache.pythoncacheextras[h]["contains"]
-            return
-
-        code = compile(check_indent(str(node)), "<string>", "exec",
-                       ast.PyCF_ONLY_AST)
-
-        for n in ast.walk(code):
-            if n.__class__.__name__ == "Call":
-                self.visit_Call(n)
-
-        self.references.update(self.var_execs)
-
-        codeparsercache.pythoncacheextras[h] = {}
-        codeparsercache.pythoncacheextras[h]["refs"] = self.references
-        codeparsercache.pythoncacheextras[h]["execs"] = self.execs
-        codeparsercache.pythoncacheextras[h]["contains"] = self.contains
-
-class ShellParser():
-    def __init__(self, name, log):
-        self.funcdefs = set()
-        self.allexecs = set()
-        self.execs = set()
-        self.log = BufferedLogger('BitBake.Data.%s' % name, logging.DEBUG, log)
-        self.unhandled_template = "unable to handle non-literal command '%s'"
-        self.unhandled_template = "while parsing %s, %s" % (name, self.unhandled_template)
-
-    def parse_shell(self, value):
-        """Parse the supplied shell code in a string, returning the external
-        commands it executes.
-        """
-
-        h = hash(str(value))
-
-        if h in codeparsercache.shellcache:
-            self.execs = codeparsercache.shellcache[h]["execs"]
-            return self.execs
-
-        if h in codeparsercache.shellcacheextras:
-            self.execs = codeparsercache.shellcacheextras[h]["execs"]
-            return self.execs
-
-        try:
-            tokens, _ = pyshyacc.parse(value, eof=True, debug=False)
-        except pyshlex.NeedMore:
-            raise sherrors.ShellSyntaxError("Unexpected EOF")
-
-        for token in tokens:
-            self.process_tokens(token)
-        self.execs = set(cmd for cmd in self.allexecs if cmd not in self.funcdefs)
-
-        codeparsercache.shellcacheextras[h] = {}
-        codeparsercache.shellcacheextras[h]["execs"] = self.execs
-
-        return self.execs
-
-    def process_tokens(self, tokens):
-        """Process a supplied portion of the syntax tree as returned by
-        pyshyacc.parse.
-        """
-
-        def function_definition(value):
-            self.funcdefs.add(value.name)
-            return [value.body], None
-
-        def case_clause(value):
-            # Element 0 of each item in the case is the list of patterns, and
-            # Element 1 of each item in the case is the list of commands to be
-            # executed when that pattern matches.
-            words = chain(*[item[0] for item in value.items])
-            cmds  = chain(*[item[1] for item in value.items])
-            return cmds, words
-
-        def if_clause(value):
-            main = chain(value.cond, value.if_cmds)
-            rest = value.else_cmds
-            if isinstance(rest, tuple) and rest[0] == "elif":
-                return chain(main, if_clause(rest[1]))
-            else:
-                return chain(main, rest)
-
-        def simple_command(value):
-            return None, chain(value.words, (assign[1] for assign in value.assigns))
-
-        token_handlers = {
-            "and_or": lambda x: ((x.left, x.right), None),
-            "async": lambda x: ([x], None),
-            "brace_group": lambda x: (x.cmds, None),
-            "for_clause": lambda x: (x.cmds, x.items),
-            "function_definition": function_definition,
-            "if_clause": lambda x: (if_clause(x), None),
-            "pipeline": lambda x: (x.commands, None),
-            "redirect_list": lambda x: ([x.cmd], None),
-            "subshell": lambda x: (x.cmds, None),
-            "while_clause": lambda x: (chain(x.condition, x.cmds), None),
-            "until_clause": lambda x: (chain(x.condition, x.cmds), None),
-            "simple_command": simple_command,
-            "case_clause": case_clause,
-        }
-
-        for token in tokens:
-            name, value = token
-            try:
-                more_tokens, words = token_handlers[name](value)
-            except KeyError:
-                raise NotImplementedError("Unsupported token type " + name)
-
-            if more_tokens:
-                self.process_tokens(more_tokens)
-
-            if words:
-                self.process_words(words)
-
-    def process_words(self, words):
-        """Process a set of 'words' in pyshyacc parlance, which includes
-        extraction of executed commands from $() blocks, as well as grabbing
-        the command name argument.
-        """
-
-        words = list(words)
-        for word in list(words):
-            wtree = pyshlex.make_wordtree(word[1])
-            for part in wtree:
-                if not isinstance(part, list):
-                    continue
-
-                if part[0] in ('`', '$('):
-                    command = pyshlex.wordtree_as_string(part[1:-1])
-                    self.parse_shell(command)
-
-                    if word[0] in ("cmd_name", "cmd_word"):
-                        if word in words:
-                            words.remove(word)
-
-        usetoken = False
-        for word in words:
-            if word[0] in ("cmd_name", "cmd_word") or \
-               (usetoken and word[0] == "TOKEN"):
-                if "=" in word[1]:
-                    usetoken = True
-                    continue
-
-                cmd = word[1]
-                if cmd.startswith("$"):
-                    self.log.debug(1, self.unhandled_template % cmd)
-                elif cmd == "eval":
-                    command = " ".join(word for _, word in words[1:])
-                    self.parse_shell(command)
-                else:
-                    self.allexecs.add(cmd)
-                break

bitbake/lib/bb/command.py

@@ -1,433 +0,0 @@
-"""
-BitBake 'Command' module
-
-Provide an interface to interact with the bitbake server through 'commands'
-"""
-
-# Copyright (C) 2006-2007  Richard Purdie
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-"""
-The bitbake server takes 'commands' from its UI/commandline.
-Commands are either synchronous or asynchronous.
-Async commands return data to the client in the form of events.
-Sync commands must only return data through the function return value
-and must not trigger events, directly or indirectly.
-Commands are queued in a CommandQueue
-"""
-
-import bb.event
-import bb.cooker
-
-class CommandCompleted(bb.event.Event):
-    pass
-
-class CommandExit(bb.event.Event):
-    def  __init__(self, exitcode):
-        bb.event.Event.__init__(self)
-        self.exitcode = int(exitcode)
-
-class CommandFailed(CommandExit):
-    def __init__(self, message):
-        self.error = message
-        CommandExit.__init__(self, 1)
-
-class CommandError(Exception):
-    pass
-
-class Command:
-    """
-    A queue of asynchronous commands for bitbake
-    """
-    def __init__(self, cooker):
-        self.cooker = cooker
-        self.cmds_sync = CommandsSync()
-        self.cmds_async = CommandsAsync()
-
-        # FIXME Add lock for this
-        self.currentAsyncCommand = None
-
-    def runCommand(self, commandline, ro_only = False):
-        command = commandline.pop(0)
-        if hasattr(CommandsSync, command):
-            # Can run synchronous commands straight away
-            command_method = getattr(self.cmds_sync, command)
-            if ro_only:
-                if not hasattr(command_method, 'readonly') or False == getattr(command_method, 'readonly'):
-                    return None, "Not able to execute not readonly commands in readonly mode"
-            try:
-                result = command_method(self, commandline)
-            except CommandError as exc:
-                return None, exc.args[0]
-            except Exception:
-                import traceback
-                return None, traceback.format_exc()
-            else:
-                return result, None
-        if self.currentAsyncCommand is not None:
-            return None, "Busy (%s in progress)" % self.currentAsyncCommand[0]
-        if command not in CommandsAsync.__dict__:
-            return None, "No such command"
-        self.currentAsyncCommand = (command, commandline)
-        self.cooker.configuration.server_register_idlecallback(self.cooker.runCommands, self.cooker)
-        return True, None
-
-    def runAsyncCommand(self):
-        try:
-            if self.cooker.state == bb.cooker.state.error:
-                return False
-            if self.currentAsyncCommand is not None:
-                (command, options) = self.currentAsyncCommand
-                commandmethod = getattr(CommandsAsync, command)
-                needcache = getattr( commandmethod, "needcache" )
-                if needcache and self.cooker.state != bb.cooker.state.running:
-                    self.cooker.updateCache()
-                    return True
-                else:
-                    commandmethod(self.cmds_async, self, options)
-                    return False
-            else:
-                return False
-        except KeyboardInterrupt as exc:
-            self.finishAsyncCommand("Interrupted")
-            return False
-        except SystemExit as exc:
-            arg = exc.args[0]
-            if isinstance(arg, basestring):
-                self.finishAsyncCommand(arg)
-            else:
-                self.finishAsyncCommand("Exited with %s" % arg)
-            return False
-        except Exception as exc:
-            import traceback
-            if isinstance(exc, bb.BBHandledException):
-                self.finishAsyncCommand("")
-            else:
-                self.finishAsyncCommand(traceback.format_exc())
-            return False
-
-    def finishAsyncCommand(self, msg=None, code=None):
-        if msg or msg == "":
-            bb.event.fire(CommandFailed(msg), self.cooker.event_data)
-        elif code:
-            bb.event.fire(CommandExit(code), self.cooker.event_data)
-        else:
-            bb.event.fire(CommandCompleted(), self.cooker.event_data)
-        self.currentAsyncCommand = None
-        self.cooker.finishcommand()
-
-class CommandsSync:
-    """
-    A class of synchronous commands
-    These should run quickly so as not to hurt interactive performance.
-    These must not influence any running synchronous command.
-    """
-
-    def stateShutdown(self, command, params):
-        """
-        Trigger cooker 'shutdown' mode
-        """
-        command.cooker.shutdown(False)
-
-    def stateForceShutdown(self, command, params):
-        """
-        Stop the cooker
-        """
-        command.cooker.shutdown(True)
-
-    def getAllKeysWithFlags(self, command, params):
-        """
-        Returns a dump of the global state. Call with
-        variable flags to be retrieved as params.
-        """
-        flaglist = params[0]
-        return command.cooker.getAllKeysWithFlags(flaglist)
-    getAllKeysWithFlags.readonly = True
-
-    def getVariable(self, command, params):
-        """
-        Read the value of a variable from data
-        """
-        varname = params[0]
-        expand = True
-        if len(params) > 1:
-            expand = (params[1] == "True")
-
-        return command.cooker.data.getVar(varname, expand)
-    getVariable.readonly = True
-
-    def setVariable(self, command, params):
-        """
-        Set the value of variable in data
-        """
-        varname = params[0]
-        value = str(params[1])
-        command.cooker.data.setVar(varname, value)
-
-    def setConfig(self, command, params):
-        """
-        Set the value of variable in configuration
-        """
-        varname = params[0]
-        value = str(params[1])
-        setattr(command.cooker.configuration, varname, value)
-
-    def enableDataTracking(self, command, params):
-        """
-        Enable history tracking for variables
-        """
-        command.cooker.enableDataTracking()
-
-    def disableDataTracking(self, command, params):
-        """
-        Disable history tracking for variables
-        """
-        command.cooker.disableDataTracking()
-
-    def setPrePostConfFiles(self, command, params):
-        prefiles = params[0].split()
-        postfiles = params[1].split()
-        command.cooker.configuration.prefile = prefiles
-        command.cooker.configuration.postfile = postfiles
-
-    def getCpuCount(self, command, params):
-        """
-        Get the CPU count on the bitbake server
-        """
-        return bb.utils.cpu_count()
-    getCpuCount.readonly = True
-
-    def matchFile(self, command, params):
-        fMatch = params[0]
-        return command.cooker.matchFile(fMatch)
-
-    def generateNewImage(self, command, params):
-        image = params[0]
-        base_image = params[1]
-        package_queue = params[2]
-        timestamp = params[3]
-        description = params[4]
-        return command.cooker.generateNewImage(image, base_image,
-                        package_queue, timestamp, description)
-
-    def ensureDir(self, command, params):
-        directory = params[0]
-        bb.utils.mkdirhier(directory)
-
-    def setVarFile(self, command, params):
-        """
-        Save a variable in a file; used for saving in a configuration file
-        """
-        var = params[0]
-        val = params[1]
-        default_file = params[2]
-        op = params[3]
-        command.cooker.modifyConfigurationVar(var, val, default_file, op)
-
-    def removeVarFile(self, command, params):
-        """
-        Remove a variable declaration from a file
-        """
-        var = params[0]
-        command.cooker.removeConfigurationVar(var)
-
-    def createConfigFile(self, command, params):
-        """
-        Create an extra configuration file
-        """
-        name = params[0]
-        command.cooker.createConfigFile(name)
-
-    def setEventMask(self, command, params):
-        handlerNum = params[0]
-        llevel = params[1]
-        debug_domains = params[2]
-        mask = params[3]
-        return bb.event.set_UIHmask(handlerNum, llevel, debug_domains, mask)
-
-class CommandsAsync:
-    """
-    A class of asynchronous commands
-    These functions communicate via generated events.
-    Any function that requires metadata parsing should be here.
-    """
-
-    def buildFile(self, command, params):
-        """
-        Build a single specified .bb file
-        """
-        bfile = params[0]
-        task = params[1]
-
-        command.cooker.buildFile(bfile, task)
-    buildFile.needcache = False
-
-    def buildTargets(self, command, params):
-        """
-        Build a set of targets
-        """
-        pkgs_to_build = params[0]
-        task = params[1]
-
-        command.cooker.buildTargets(pkgs_to_build, task)
-    buildTargets.needcache = True
-
-    def generateDepTreeEvent(self, command, params):
-        """
-        Generate an event containing the dependency information
-        """
-        pkgs_to_build = params[0]
-        task = params[1]
-
-        command.cooker.generateDepTreeEvent(pkgs_to_build, task)
-        command.finishAsyncCommand()
-    generateDepTreeEvent.needcache = True
-
-    def generateDotGraph(self, command, params):
-        """
-        Dump dependency information to disk as .dot files
-        """
-        pkgs_to_build = params[0]
-        task = params[1]
-
-        command.cooker.generateDotGraphFiles(pkgs_to_build, task)
-        command.finishAsyncCommand()
-    generateDotGraph.needcache = True
-
-    def generateTargetsTree(self, command, params):
-        """
-        Generate a tree of buildable targets.
-        If klass is provided ensure all recipes that inherit the class are
-        included in the package list.
-        If pkg_list provided use that list (plus any extras brought in by
-        klass) rather than generating a tree for all packages.
-        """
-        klass = params[0]
-        pkg_list = params[1]
-
-        command.cooker.generateTargetsTree(klass, pkg_list)
-        command.finishAsyncCommand()
-    generateTargetsTree.needcache = True
-
-    def findCoreBaseFiles(self, command, params):
-        """
-        Find certain files in COREBASE directory. i.e. Layers
-        """
-        subdir = params[0]
-        filename = params[1]
-
-        command.cooker.findCoreBaseFiles(subdir, filename)
-        command.finishAsyncCommand()
-    findCoreBaseFiles.needcache = False
-
-    def findConfigFiles(self, command, params):
-        """
-        Find config files which provide appropriate values
-        for the passed configuration variable. i.e. MACHINE
-        """
-        varname = params[0]
-
-        command.cooker.findConfigFiles(varname)
-        command.finishAsyncCommand()
-    findConfigFiles.needcache = False
-
-    def findFilesMatchingInDir(self, command, params):
-        """
-        Find implementation files matching the specified pattern
-        in the requested subdirectory of a BBPATH
-        """
-        pattern = params[0]
-        directory = params[1]
-
-        command.cooker.findFilesMatchingInDir(pattern, directory)
-        command.finishAsyncCommand()
-    findFilesMatchingInDir.needcache = False
-
-    def findConfigFilePath(self, command, params):
-        """
-        Find the path of the requested configuration file
-        """
-        configfile = params[0]
-
-        command.cooker.findConfigFilePath(configfile)
-        command.finishAsyncCommand()
-    findConfigFilePath.needcache = False
-
-    def showVersions(self, command, params):
-        """
-        Show the currently selected versions
-        """
-        command.cooker.showVersions()
-        command.finishAsyncCommand()
-    showVersions.needcache = True
-
-    def showEnvironmentTarget(self, command, params):
-        """
-        Print the environment of a target recipe
-        (needs the cache to work out which recipe to use)
-        """
-        pkg = params[0]
-
-        command.cooker.showEnvironment(None, pkg)
-        command.finishAsyncCommand()
-    showEnvironmentTarget.needcache = True
-
-    def showEnvironment(self, command, params):
-        """
-        Print the standard environment
-        or if specified the environment for a specified recipe
-        """
-        bfile = params[0]
-
-        command.cooker.showEnvironment(bfile)
-        command.finishAsyncCommand()
-    showEnvironment.needcache = False
-
-    def parseFiles(self, command, params):
-        """
-        Parse the .bb files
-        """
-        command.cooker.updateCache()
-        command.finishAsyncCommand()
-    parseFiles.needcache = True
-
-    def compareRevisions(self, command, params):
-        """
-        Parse the .bb files
-        """
-        if bb.fetch.fetcher_compare_revisions(command.cooker.data):
-            command.finishAsyncCommand(code=1)
-        else:
-            command.finishAsyncCommand()
-    compareRevisions.needcache = True
-
-    def triggerEvent(self, command, params):
-        """
-        Trigger a certain event
-        """
-        event = params[0]
-        bb.event.fire(eval(event), command.cooker.data)
-        command.currentAsyncCommand = None
-    triggerEvent.needcache = False
-
-    def resetCooker(self, command, params):
-        """
-        Reset the cooker to its initial state, thus forcing a reparse for
-        any async command that has the needcache property set to True
-        """
-        command.cooker.reset()
-        command.finishAsyncCommand()
-    resetCooker.needcache = False
-

bitbake/lib/bb/compat.py

@@ -1,6 +0,0 @@
-"""Code pulled from future python versions, here for compatibility"""
-
-from collections import MutableMapping, KeysView, ValuesView, ItemsView, OrderedDict
-from functools import total_ordering
-
-

bitbake/lib/bb/cookerdata.py

@@ -1,305 +0,0 @@
-#!/usr/bin/env python
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-#
-# Copyright (C) 2003, 2004  Chris Larson
-# Copyright (C) 2003, 2004  Phil Blundell
-# Copyright (C) 2003 - 2005 Michael 'Mickey' Lauer
-# Copyright (C) 2005        Holger Hans Peter Freyther
-# Copyright (C) 2005        ROAD GmbH
-# Copyright (C) 2006        Richard Purdie
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import os, sys
-from functools import wraps
-import logging
-import bb
-from bb import data
-import bb.parse
-
-logger      = logging.getLogger("BitBake")
-parselog    = logging.getLogger("BitBake.Parsing")
-
-class ConfigParameters(object):
-    def __init__(self):
-        self.options, targets = self.parseCommandLine()
-        self.environment = self.parseEnvironment()
-
-        self.options.pkgs_to_build = targets or []
-
-        self.options.tracking = False
-        if hasattr(self.options, "show_environment") and self.options.show_environment:
-            self.options.tracking = True
-
-        for key, val in self.options.__dict__.items():
-            setattr(self, key, val)
-
-    def parseCommandLine(self):
-        raise Exception("Caller must implement commandline option parsing")
-
-    def parseEnvironment(self):
-        return os.environ.copy()
-
-    def updateFromServer(self, server):
-        if not self.options.cmd:
-            defaulttask, error = server.runCommand(["getVariable", "BB_DEFAULT_TASK"])
-            if error:
-                raise Exception("Unable to get the value of BB_DEFAULT_TASK from the server: %s" % error)
-            self.options.cmd = defaulttask or "build"
-        _, error = server.runCommand(["setConfig", "cmd", self.options.cmd])
-        if error:
-            raise Exception("Unable to set configuration option 'cmd' on the server: %s" % error)
-
-        if not self.options.pkgs_to_build:
-            bbpkgs, error = server.runCommand(["getVariable", "BBPKGS"])
-            if error:
-                raise Exception("Unable to get the value of BBPKGS from the server: %s" % error)
-            if bbpkgs:
-                self.options.pkgs_to_build.extend(bbpkgs.split())
-
-    def parseActions(self):
-        # Parse any commandline into actions
-        action = {'action':None, 'msg':None}
-        if self.options.show_environment:
-            if 'world' in self.options.pkgs_to_build:
-                action['msg'] = "'world' is not a valid target for --environment."
-            elif 'universe' in self.options.pkgs_to_build:
-                action['msg'] = "'universe' is not a valid target for --environment."
-            elif len(self.options.pkgs_to_build) > 1:
-                action['msg'] = "Only one target can be used with the --environment option."
-            elif self.options.buildfile and len(self.options.pkgs_to_build) > 0:
-                action['msg'] = "No target should be used with the --environment and --buildfile options."
-            elif len(self.options.pkgs_to_build) > 0:
-                action['action'] = ["showEnvironmentTarget", self.options.pkgs_to_build]
-            else:
-                action['action'] = ["showEnvironment", self.options.buildfile]
-        elif self.options.buildfile is not None:
-            action['action'] = ["buildFile", self.options.buildfile, self.options.cmd]
-        elif self.options.revisions_changed:
-            action['action'] = ["compareRevisions"]
-        elif self.options.show_versions:
-            action['action'] = ["showVersions"]
-        elif self.options.parse_only:
-            action['action'] = ["parseFiles"]
-        elif self.options.dot_graph:
-            if self.options.pkgs_to_build:
-                action['action'] = ["generateDotGraph", self.options.pkgs_to_build, self.options.cmd]
-            else:
-                action['msg'] = "Please specify a package name for dependency graph generation."
-        else:
-            if self.options.pkgs_to_build:
-                action['action'] = ["buildTargets", self.options.pkgs_to_build, self.options.cmd]
-            else:
-                #action['msg'] = "Nothing to do.  Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information."
-                action = None
-        self.options.initialaction = action
-        return action
-
-class CookerConfiguration(object):
-    """
-    Manages build options and configurations for one run
-    """
-
-    def __init__(self):
-        self.debug_domains = []
-        self.extra_assume_provided = []
-        self.prefile = []
-        self.postfile = []
-        self.debug = 0
-        self.cmd = None
-        self.abort = True
-        self.force = False
-        self.profile = False
-        self.nosetscene = False
-        self.invalidate_stamp = False
-        self.dump_signatures = False
-        self.dry_run = False
-        self.tracking = False
-        self.interface = []
-
-        self.env = {}
-
-    def setConfigParameters(self, parameters):
-        for key in self.__dict__.keys():
-            if key in parameters.options.__dict__:
-                setattr(self, key, parameters.options.__dict__[key])
-        self.env = parameters.environment.copy()
-        self.tracking = parameters.tracking
-
-    def setServerRegIdleCallback(self, srcb):
-        self.server_register_idlecallback = srcb
-
-    def __getstate__(self):
-        state = {}
-        for key in self.__dict__.keys():
-            if key == "server_register_idlecallback":
-                state[key] = None
-            else:
-                state[key] = getattr(self, key)
-        return state
-
-    def __setstate__(self,state):
-        for k in state:
-            setattr(self, k, state[k]) 
-
-
-def catch_parse_error(func):
-    """Exception handling bits for our parsing"""
-    @wraps(func)
-    def wrapped(fn, *args):
-        try:
-            return func(fn, *args)
-        except (IOError, bb.parse.ParseError, bb.data_smart.ExpansionError) as exc:
-            import traceback
-            parselog.critical( traceback.format_exc())
-            parselog.critical("Unable to parse %s: %s" % (fn, exc))
-            sys.exit(1)
-    return wrapped
-
-@catch_parse_error
-def parse_config_file(fn, data, include=True):
-    return bb.parse.handle(fn, data, include)
-
-@catch_parse_error
-def _inherit(bbclass, data):
-    bb.parse.BBHandler.inherit(bbclass, "configuration INHERITs", 0, data)
-    return data
-
-def findConfigFile(configfile, data):
-    search = []
-    bbpath = data.getVar("BBPATH", True)
-    if bbpath:
-        for i in bbpath.split(":"):
-            search.append(os.path.join(i, "conf", configfile))
-    path = os.getcwd()
-    while path != "/":
-        search.append(os.path.join(path, "conf", configfile))
-        path, _ = os.path.split(path)
-
-    for i in search:
-        if os.path.exists(i):
-            return i
-
-    return None
-
-class CookerDataBuilder(object):
-
-    def __init__(self, cookercfg, worker = False):
-
-        self.prefiles = cookercfg.prefile
-        self.postfiles = cookercfg.postfile
-        self.tracking = cookercfg.tracking
-
-        bb.utils.set_context(bb.utils.clean_context())
-        bb.event.set_class_handlers(bb.event.clean_class_handlers())
-        self.data = bb.data.init()
-        if self.tracking:
-            self.data.enableTracking()
-
-        # Keep a datastore of the initial environment variables and their
-        # values from when BitBake was launched to enable child processes
-        # to use environment variables which have been cleaned from the
-        # BitBake processes env
-        self.savedenv = bb.data.init()
-        for k in cookercfg.env:
-            self.savedenv.setVar(k, cookercfg.env[k])
-
-        filtered_keys = bb.utils.approved_variables()
-        bb.data.inheritFromOS(self.data, self.savedenv, filtered_keys)
-        self.data.setVar("BB_ORIGENV", self.savedenv)
-        
-        if worker:
-            self.data.setVar("BB_WORKERCONTEXT", "1")
-
-    def parseBaseConfiguration(self):
-        try:
-            self.parseConfigurationFiles(self.prefiles, self.postfiles)
-        except SyntaxError:
-            sys.exit(1)
-        except Exception:
-            logger.exception("Error parsing configuration files")
-            sys.exit(1)
-
-    def _findLayerConf(self, data):
-        return findConfigFile("bblayers.conf", data)
-
-    def parseConfigurationFiles(self, prefiles, postfiles):
-        data = self.data
-        bb.parse.init_parser(data)
-
-        # Parse files for loading *before* bitbake.conf and any includes
-        for f in prefiles:
-            data = parse_config_file(f, data)
-
-        layerconf = self._findLayerConf(data)
-        if layerconf:
-            parselog.debug(2, "Found bblayers.conf (%s)", layerconf)
-            # By definition bblayers.conf is in conf/ of TOPDIR.
-            # We may have been called with cwd somewhere else so reset TOPDIR
-            data.setVar("TOPDIR", os.path.dirname(os.path.dirname(layerconf)))
-            data = parse_config_file(layerconf, data)
-
-            layers = (data.getVar('BBLAYERS', True) or "").split()
-
-            data = bb.data.createCopy(data)
-            for layer in layers:
-                parselog.debug(2, "Adding layer %s", layer)
-                data.setVar('LAYERDIR', layer)
-                data = parse_config_file(os.path.join(layer, "conf", "layer.conf"), data)
-                data.expandVarref('LAYERDIR')
-
-            data.delVar('LAYERDIR')
-
-        if not data.getVar("BBPATH", True):
-            msg = "The BBPATH variable is not set"
-            if not layerconf:
-                msg += (" and bitbake did not find a conf/bblayers.conf file in"
-                        " the expected location.\nMaybe you accidentally"
-                        " invoked bitbake from the wrong directory?")
-            raise SystemExit(msg)
-
-        data = parse_config_file(os.path.join("conf", "bitbake.conf"), data)
-
-        # Parse files for loading *after* bitbake.conf and any includes
-        for p in postfiles:
-            data = parse_config_file(p, data)
-
-        # Handle any INHERITs and inherit the base class
-        bbclasses  = ["base"] + (data.getVar('INHERIT', True) or "").split()
-        for bbclass in bbclasses:
-            data = _inherit(bbclass, data)
-
-        # Nomally we only register event handlers at the end of parsing .bb files
-        # We register any handlers we've found so far here...
-        for var in data.getVar('__BBHANDLERS') or []:
-            bb.event.register(var, data.getVar(var),  (data.getVarFlag(var, "eventmask", True) or "").split())
-
-        if data.getVar("BB_WORKERCONTEXT", False) is None:
-            bb.fetch.fetcher_init(data)
-        bb.codeparser.parser_cache_init(data)
-        bb.event.fire(bb.event.ConfigParsed(), data)
-
-        if data.getVar("BB_INVALIDCONF") is True:
-            data.setVar("BB_INVALIDCONF", False)
-            self.parseConfigurationFiles(self.prefiles, self.postfiles)
-            return
-
-        bb.parse.init_parser(data)
-        data.setVar('BBINCLUDED',bb.parse.get_file_depends(data))
-        self.data = data
-        self.data_hash = data.get_hash()
-
-
-

bitbake/lib/bb/daemonize.py

@@ -1,190 +0,0 @@
-"""
-Python Deamonizing helper
-
-Configurable daemon behaviors:
-
-    1.) The current working directory set to the "/" directory.
-    2.) The current file creation mode mask set to 0.
-    3.) Close all open files (1024). 
-    4.) Redirect standard I/O streams to "/dev/null".
-
-A failed call to fork() now raises an exception.
-
-References:
-    1) Advanced Programming in the Unix Environment: W. Richard Stevens
-    2) Unix Programming Frequently Asked Questions:
-            http://www.erlenstar.demon.co.uk/unix/faq_toc.html
-
-Modified to allow a function to be daemonized and return for 
-bitbake use by Richard Purdie
-"""
-
-__author__ = "Chad J. Schroeder"
-__copyright__ = "Copyright (C) 2005 Chad J. Schroeder"
-__version__ = "0.2"
-
-# Standard Python modules.
-import os                    # Miscellaneous OS interfaces.
-import sys                  # System-specific parameters and functions.
-
-# Default daemon parameters.
-# File mode creation mask of the daemon.
-# For BitBake's children, we do want to inherit the parent umask.
-UMASK = None
-
-# Default maximum for the number of available file descriptors.
-MAXFD = 1024
-
-# The standard I/O file descriptors are redirected to /dev/null by default.
-if (hasattr(os, "devnull")):
-    REDIRECT_TO = os.devnull
-else:
-    REDIRECT_TO = "/dev/null"
-
-def createDaemon(function, logfile):
-    """
-    Detach a process from the controlling terminal and run it in the
-    background as a daemon, returning control to the caller.
-    """
-
-    try:
-        # Fork a child process so the parent can exit.  This returns control to
-        # the command-line or shell.  It also guarantees that the child will not
-        # be a process group leader, since the child receives a new process ID
-        # and inherits the parent's process group ID.  This step is required
-        # to insure that the next call to os.setsid is successful.
-        pid = os.fork()
-    except OSError as e:
-        raise Exception("%s [%d]" % (e.strerror, e.errno))
-
-    if (pid == 0):      # The first child.
-        # To become the session leader of this new session and the process group
-        # leader of the new process group, we call os.setsid().  The process is
-        # also guaranteed not to have a controlling terminal.
-        os.setsid()
-
-        # Is ignoring SIGHUP necessary?
-        #
-        # It's often suggested that the SIGHUP signal should be ignored before
-        # the second fork to avoid premature termination of the process.  The
-        # reason is that when the first child terminates, all processes, e.g.
-        # the second child, in the orphaned group will be sent a SIGHUP.
-        #
-        # "However, as part of the session management system, there are exactly
-        # two cases where SIGHUP is sent on the death of a process:
-        #
-        #    1) When the process that dies is the session leader of a session that
-        #        is attached to a terminal device, SIGHUP is sent to all processes
-        #        in the foreground process group of that terminal device.
-        #    2) When the death of a process causes a process group to become
-        #        orphaned, and one or more processes in the orphaned group are
-        #        stopped, then SIGHUP and SIGCONT are sent to all members of the
-        #        orphaned group." [2]
-        #
-        # The first case can be ignored since the child is guaranteed not to have
-        # a controlling terminal.  The second case isn't so easy to dismiss.
-        # The process group is orphaned when the first child terminates and
-        # POSIX.1 requires that every STOPPED process in an orphaned process
-        # group be sent a SIGHUP signal followed by a SIGCONT signal.  Since the
-        # second child is not STOPPED though, we can safely forego ignoring the
-        # SIGHUP signal.  In any case, there are no ill-effects if it is ignored.
-        #
-        # import signal              # Set handlers for asynchronous events.
-        # signal.signal(signal.SIGHUP, signal.SIG_IGN)
-
-        try:
-            # Fork a second child and exit immediately to prevent zombies.  This
-            # causes the second child process to be orphaned, making the init
-            # process responsible for its cleanup.  And, since the first child is
-            # a session leader without a controlling terminal, it's possible for
-            # it to acquire one by opening a terminal in the future (System V-
-            # based systems).  This second fork guarantees that the child is no
-            # longer a session leader, preventing the daemon from ever acquiring
-            # a controlling terminal.
-            pid = os.fork()     # Fork a second child.
-        except OSError as e:
-            raise Exception("%s [%d]" % (e.strerror, e.errno))
-
-        if (pid == 0):  # The second child.
-            # We probably don't want the file mode creation mask inherited from
-            # the parent, so we give the child complete control over permissions.
-            if UMASK is not None:
-                os.umask(UMASK)
-        else:
-            # Parent (the first child) of the second child.
-            os._exit(0)
-    else:
-        # exit() or _exit()?
-        # _exit is like exit(), but it doesn't call any functions registered
-        # with atexit (and on_exit) or any registered signal handlers.  It also
-        # closes any open file descriptors.  Using exit() may cause all stdio
-        # streams to be flushed twice and any temporary files may be unexpectedly
-        # removed.  It's therefore recommended that child branches of a fork()
-        # and the parent branch(es) of a daemon use _exit().
-        return
-
-    # Close all open file descriptors.  This prevents the child from keeping
-    # open any file descriptors inherited from the parent.  There is a variety
-    # of methods to accomplish this task.  Three are listed below.
-    #
-    # Try the system configuration variable, SC_OPEN_MAX, to obtain the maximum
-    # number of open file descriptors to close.  If it doesn't exists, use
-    # the default value (configurable).
-    #
-    # try:
-    #     maxfd = os.sysconf("SC_OPEN_MAX")
-    # except (AttributeError, ValueError):
-    #     maxfd = MAXFD
-    #
-    # OR
-    #
-    # if (os.sysconf_names.has_key("SC_OPEN_MAX")):
-    #     maxfd = os.sysconf("SC_OPEN_MAX")
-    # else:
-    #     maxfd = MAXFD
-    #
-    # OR
-    #
-    # Use the getrlimit method to retrieve the maximum file descriptor number
-    # that can be opened by this process.  If there is not limit on the
-    # resource, use the default value.
-    #
-    import resource             # Resource usage information.
-    maxfd = resource.getrlimit(resource.RLIMIT_NOFILE)[1]
-    if (maxfd == resource.RLIM_INFINITY):
-        maxfd = MAXFD
-  
-    # Iterate through and close all file descriptors.
-#    for fd in range(0, maxfd):
-#        try:
-#            os.close(fd)
-#        except OSError:        # ERROR, fd wasn't open to begin with (ignored)
-#            pass
-
-    # Redirect the standard I/O file descriptors to the specified file.  Since
-    # the daemon has no controlling terminal, most daemons redirect stdin,
-    # stdout, and stderr to /dev/null.  This is done to prevent side-effects
-    # from reads and writes to the standard I/O file descriptors.
-
-    # This call to open is guaranteed to return the lowest file descriptor,
-    # which will be 0 (stdin), since it was closed above.
-#    os.open(REDIRECT_TO, os.O_RDWR)    # standard input (0)
-
-    # Duplicate standard input to standard output and standard error.
-#    os.dup2(0, 1)                      # standard output (1)
-#    os.dup2(0, 2)                      # standard error (2)
-
-
-    si = file('/dev/null', 'r')
-    so = file(logfile, 'w')
-    se = so
-
-
-    # Replace those fds with our own
-    os.dup2(si.fileno(), sys.stdin.fileno())
-    os.dup2(so.fileno(), sys.stdout.fileno())
-    os.dup2(se.fileno(), sys.stderr.fileno())
-
-    function()
-
-    os._exit(0)

bitbake/lib/bb/data.py

@@ -11,7 +11,7 @@ operations. At night the cookie monster came by and
 suggested 'give me cookies on setting the variables and
 things will work out'. Taking this suggestion into account
 applying the skills from the not yet passed 'Entwurf und
-Analyse von Algorithmen' lecture and the cookie
+Analyse von Algorithmen' lecture and the cookie 
 monster seems to be right. We will track setVar more carefully
 to have faster update_data and expandKeys operations.
 
@@ -37,42 +37,36 @@ the speed is more critical here.
 #
 #Based on functions from the base bb module, Copyright 2003 Holger Schurig
 
-import sys, os, re
+import sys, os, re, time, types
 if sys.argv[0][-5:] == "pydoc":
     path = os.path.dirname(os.path.dirname(sys.argv[1]))
 else:
     path = os.path.dirname(os.path.dirname(sys.argv[0]))
-sys.path.insert(0, path)
-from itertools import groupby
+sys.path.insert(0,path)
 
 from bb import data_smart
-from bb import codeparser
 import bb
 
-logger = data_smart.logger
 _dict_type = data_smart.DataSmart
 
 def init():
-    """Return a new object representing the Bitbake data"""
     return _dict_type()
 
 def init_db(parent = None):
-    """Return a new object representing the Bitbake data,
-    optionally based on an existing object"""
-    if parent is not None:
+    if parent:
         return parent.createCopy()
     else:
         return _dict_type()
 
 def createCopy(source):
-    """Link the source set to the destination
-    If one does not find the value in the destination set,
-    search will go on to the source set to get the value.
-    Value from source are copy-on-write. i.e. any try to
-    modify one of them will end up putting the modified value
-    in the destination set.
-    """
-    return source.createCopy()
+     """Link the source set to the destination
+     If one does not find the value in the destination set,
+     search will go on to the source set to get the value.
+     Value from source are copy-on-write. i.e. any try to
+     modify one of them will end up putting the modified value
+     in the destination set.
+     """
+     return source.createCopy()
 
 def initVar(var, d):
     """Non-destructive var init for data structure"""
@@ -80,38 +74,91 @@ def initVar(var, d):
 
 
 def setVar(var, value, d):
-    """Set a variable to a given value"""
-    d.setVar(var, value)
+    """Set a variable to a given value
+
+    Example:
+        >>> d = init()
+        >>> setVar('TEST', 'testcontents', d)
+        >>> print getVar('TEST', d)
+        testcontents
+    """
+    d.setVar(var,value)
 
 
 def getVar(var, d, exp = 0):
-    """Gets the value of a variable"""
-    return d.getVar(var, exp)
+    """Gets the value of a variable
+
+    Example:
+        >>> d = init()
+        >>> setVar('TEST', 'testcontents', d)
+        >>> print getVar('TEST', d)
+        testcontents
+    """
+    return d.getVar(var,exp)
 
 
 def renameVar(key, newkey, d):
-    """Renames a variable from key to newkey"""
+    """Renames a variable from key to newkey
+
+    Example:
+        >>> d = init()
+        >>> setVar('TEST', 'testcontents', d)
+        >>> renameVar('TEST', 'TEST2', d)
+        >>> print getVar('TEST2', d)
+        testcontents
+    """
     d.renameVar(key, newkey)
 
 def delVar(var, d):
-    """Removes a variable from the data set"""
+    """Removes a variable from the data set
+
+    Example:
+        >>> d = init()
+        >>> setVar('TEST', 'testcontents', d)
+        >>> print getVar('TEST', d)
+        testcontents
+        >>> delVar('TEST', d)
+        >>> print getVar('TEST', d)
+        None
+    """
     d.delVar(var)
 
-def appendVar(var, value, d):
-    """Append additional value to a variable"""
-    d.appendVar(var, value)
-
 def setVarFlag(var, flag, flagvalue, d):
-    """Set a flag for a given variable to a given value"""
-    d.setVarFlag(var, flag, flagvalue)
+    """Set a flag for a given variable to a given value
+
+    Example:
+        >>> d = init()
+        >>> setVarFlag('TEST', 'python', 1, d)
+        >>> print getVarFlag('TEST', 'python', d)
+        1
+    """
+    d.setVarFlag(var,flag,flagvalue)
 
 def getVarFlag(var, flag, d):
-    """Gets given flag from given var"""
-    return d.getVarFlag(var, flag)
+    """Gets given flag from given var
+
+    Example:
+        >>> d = init()
+        >>> setVarFlag('TEST', 'python', 1, d)
+        >>> print getVarFlag('TEST', 'python', d)
+        1
+    """
+    return d.getVarFlag(var,flag)
 
 def delVarFlag(var, flag, d):
-    """Removes a given flag from the variable's flags"""
-    d.delVarFlag(var, flag)
+    """Removes a given flag from the variable's flags
+
+    Example:
+        >>> d = init()
+        >>> setVarFlag('TEST', 'testflag', 1, d)
+        >>> print getVarFlag('TEST', 'testflag', d)
+        1
+        >>> delVarFlag('TEST', 'testflag', d)
+        >>> print getVarFlag('TEST', 'testflag', d)
+        None
+
+    """
+    d.delVarFlag(var,flag)
 
 def setVarFlags(var, flags, d):
     """Set the flags for a given variable
@@ -120,27 +167,115 @@ def setVarFlags(var, flags, d):
         setVarFlags will not clear previous
         flags. Think of this method as
         addVarFlags
+
+    Example:
+        >>> d = init()
+        >>> myflags = {}
+        >>> myflags['test'] = 'blah'
+        >>> setVarFlags('TEST', myflags, d)
+        >>> print getVarFlag('TEST', 'test', d)
+        blah
     """
-    d.setVarFlags(var, flags)
+    d.setVarFlags(var,flags)
 
 def getVarFlags(var, d):
-    """Gets a variable's flags"""
+    """Gets a variable's flags
+
+    Example:
+        >>> d = init()
+        >>> setVarFlag('TEST', 'test', 'blah', d)
+        >>> print getVarFlags('TEST', d)['test']
+        blah
+    """
     return d.getVarFlags(var)
 
 def delVarFlags(var, d):
-    """Removes a variable's flags"""
+    """Removes a variable's flags
+
+    Example:
+        >>> data = init()
+        >>> setVarFlag('TEST', 'testflag', 1, data)
+        >>> print getVarFlag('TEST', 'testflag', data)
+        1
+        >>> delVarFlags('TEST', data)
+        >>> print getVarFlags('TEST', data)
+        None
+
+    """
     d.delVarFlags(var)
 
 def keys(d):
-    """Return a list of keys in d"""
+    """Return a list of keys in d
+
+    Example:
+        >>> d = init()
+        >>> setVar('TEST',  1, d)
+        >>> setVar('MOO' ,  2, d)
+        >>> setVarFlag('TEST', 'test', 1, d)
+        >>> keys(d)
+        ['TEST', 'MOO']
+    """
     return d.keys()
 
+def getData(d):
+    """Returns the data object used"""
+    return d
+
+def setData(newData, d):
+    """Sets the data object to the supplied value"""
+    d = newData
+
+
+##
+## Cookie Monsters' query functions
+##
+def _get_override_vars(d, override):
+    """
+    Internal!!!
+
+    Get the Names of Variables that have a specific
+    override. This function returns a iterable
+    Set or an empty list
+    """
+    return []
+
+def _get_var_flags_triple(d):
+    """
+    Internal!!!
+
+    """
+    return []
 
 __expand_var_regexp__ = re.compile(r"\${[^{}]+}")
 __expand_python_regexp__ = re.compile(r"\${@.+?}")
 
 def expand(s, d, varname = None):
-    """Variable expansion using the data store"""
+    """Variable expansion using the data store.
+
+    Example:
+        Standard expansion:
+        >>> d = init()
+        >>> setVar('A', 'sshd', d)
+        >>> print expand('/usr/bin/${A}', d)
+        /usr/bin/sshd
+
+        Python expansion:
+        >>> d = init()
+        >>> print expand('result: ${@37 * 72}', d)
+        result: 2664
+
+        Shell expansion:
+        >>> d = init()
+        >>> print expand('${TARGET_MOO}', d)
+        ${TARGET_MOO}
+        >>> setVar('TARGET_MOO', 'yupp', d)
+        >>> print expand('${TARGET_MOO}',d)
+        yupp
+        >>> setVar('SRC_URI', 'http://somebug.${TARGET_MOO}', d)
+        >>> delVar('TARGET_MOO', d)
+        >>> print expand('${SRC_URI}', d)
+        http://somebug.${TARGET_MOO}
+    """
     return d.expand(s, varname)
 
 def expandKeys(alterdata, readdata = None):
@@ -148,7 +283,7 @@ def expandKeys(alterdata, readdata = None):
         readdata = alterdata
 
     todolist = {}
-    for key in alterdata:
+    for key in keys(alterdata):
         if not '${' in key:
             continue
 
@@ -157,30 +292,54 @@ def expandKeys(alterdata, readdata = None):
             continue
         todolist[key] = ekey
 
-    # These two for loops are split for performance to maximise the
+    # These two for loops are split for performance to maximise the 
     # usefulness of the expand cache
 
     for key in todolist:
         ekey = todolist[key]
-        newval = alterdata.getVar(ekey, 0)
-        if newval:
-            val = alterdata.getVar(key, 0)
-            if val is not None and newval is not None:
-                bb.warn("Variable key %s (%s) replaces original key %s (%s)." % (key, val, ekey, newval))
-        alterdata.renameVar(key, ekey)
+        renameVar(key, ekey, alterdata)
 
-def inheritFromOS(d, savedenv, permitted):
-    """Inherit variables from the initial environment."""
-    exportlist = bb.utils.preserved_envvars_exported()
-    for s in savedenv.keys():
-        if s in permitted:
+def expandData(alterdata, readdata = None):
+    """For each variable in alterdata, expand it, and update the var contents.
+       Replacements use data from readdata.
+
+    Example:
+        >>> a=init()
+        >>> b=init()
+        >>> setVar("dlmsg", "dl_dir is ${DL_DIR}", a)
+        >>> setVar("DL_DIR", "/path/to/whatever", b)
+        >>> expandData(a, b)
+        >>> print getVar("dlmsg", a)
+        dl_dir is /path/to/whatever
+       """
+    if readdata == None:
+        readdata = alterdata
+
+    for key in keys(alterdata):
+        val = getVar(key, alterdata)
+        if type(val) is not types.StringType:
+            continue
+        expanded = expand(val, readdata)
+#       print "key is %s, val is %s, expanded is %s" % (key, val, expanded)
+        if val != expanded:
+            setVar(key, expanded, alterdata)
+
+import os
+
+def inheritFromOS(d):
+    """Inherit variables from the environment."""
+#   fakeroot needs to be able to set these
+    non_inherit_vars = [ "LD_LIBRARY_PATH", "LD_PRELOAD" ]
+    for s in os.environ.keys():
+        if not s in non_inherit_vars:
             try:
-                d.setVar(s, getVar(s, savedenv, True), op = 'from env')
-                if s in exportlist:
-                    d.setVarFlag(s, "export", True, op = 'auto env export')
+                setVar(s, os.environ[s], d)
+                setVarFlag(s, 'matchesenv', '1', d)
             except TypeError:
                 pass
 
+import sys
+
 def emit_var(var, o=sys.__stdout__, d = init(), all=False):
     """Emit a variable to be sourced by a shell."""
     if getVarFlag(var, "python", d):
@@ -196,14 +355,20 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False):
         if all:
             oval = getVar(var, d, 0)
         val = getVar(var, d, 1)
-    except (KeyboardInterrupt, bb.build.FuncFailed):
+    except KeyboardInterrupt:
         raise
-    except Exception as exc:
-        o.write('# expansion of %s threw %s: %s\n' % (var, exc.__class__.__name__, str(exc)))
+    except:
+        excname = str(sys.exc_info()[0])
+        if excname == "bb.build.FuncFailed":
+            raise
+        o.write('# expansion of %s threw %s\n' % (var, excname))
         return 0
 
     if all:
-        d.varhistory.emit(var, oval, val, o)
+        o.write('# %s=%s\n' % (var, oval))
+
+    if type(val) is not types.StringType:
+        return 0
 
     if (var.find("-") != -1 or var.find(".") != -1 or var.find('{') != -1 or var.find('}') != -1 or var.find('+') != -1) and not all:
         return 0
@@ -212,13 +377,15 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False):
 
     if unexport:
         o.write('unset %s\n' % varExpanded)
+        return 1
+
+    if getVarFlag(var, 'matchesenv', d):
         return 0
 
-    if val is None:
+    val.rstrip()
+    if not val:
         return 0
 
-    val = str(val)
-
     if func:
         # NOTE: should probably check for unbalanced {} within the var
         o.write("%s() {\n%s\n}\n" % (varExpanded, val))
@@ -229,169 +396,175 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False):
 
     # if we're going to output this within doublequotes,
     # to a shell, we need to escape the quotes in the var
-    alter = re.sub('"', '\\"', val)
-    alter = re.sub('\n', ' \\\n', alter)
+    alter = re.sub('"', '\\"', val.strip())
     o.write('%s="%s"\n' % (varExpanded, alter))
-    return 0
+    return 1
+
 
 def emit_env(o=sys.__stdout__, d = init(), all=False):
     """Emits all items in the data store in a format such that it can be sourced by a shell."""
 
-    isfunc = lambda key: bool(d.getVarFlag(key, "func"))
-    keys = sorted((key for key in d.keys() if not key.startswith("__")), key=isfunc)
-    grouped = groupby(keys, isfunc)
-    for isfunc, keys in grouped:
-        for key in keys:
-            emit_var(key, o, d, all and not isfunc) and o.write('\n')
+    env = keys(d)
 
-def exported_keys(d):
-    return (key for key in d.keys() if not key.startswith('__') and
-                                      d.getVarFlag(key, 'export') and
-                                      not d.getVarFlag(key, 'unexport'))
+    for e in env:
+        if getVarFlag(e, "func", d):
+            continue
+        emit_var(e, o, d, all) and o.write('\n')
 
-def exported_vars(d):
-    for key in exported_keys(d):
-        try:
-            value = d.getVar(key, True)
-        except Exception:
-            pass
-
-        if value is not None:
-            yield key, str(value)
-
-def emit_func(func, o=sys.__stdout__, d = init()):
-    """Emits all items in the data store in a format such that it can be sourced by a shell."""
-
-    keys = (key for key in d.keys() if not key.startswith("__") and not d.getVarFlag(key, "func"))
-    for key in keys:
-        emit_var(key, o, d, False) and o.write('\n')
-
-    emit_var(func, o, d, False) and o.write('\n')
-    newdeps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func, True))
-    newdeps |= set((d.getVarFlag(func, "vardeps", True) or "").split())
-    seen = set()
-    while newdeps:
-        deps = newdeps
-        seen |= deps
-        newdeps = set()
-        for dep in deps:
-            if d.getVarFlag(dep, "func") and not d.getVarFlag(dep, "python"):
-               emit_var(dep, o, d, False) and o.write('\n')
-               newdeps |=  bb.codeparser.ShellParser(dep, logger).parse_shell(d.getVar(dep, True))
-               newdeps |= set((d.getVarFlag(dep, "vardeps", True) or "").split())
-        newdeps -= seen
+    for e in env:
+        if not getVarFlag(e, "func", d):
+            continue
+        emit_var(e, o, d) and o.write('\n')
 
 def update_data(d):
-    """Performs final steps upon the datastore, including application of overrides"""
-    d.finalize(parent = True)
+    """Modifies the environment vars according to local overrides and commands.
+    Examples:
+        Appending to a variable:
+        >>> d = init()
+        >>> setVar('TEST', 'this is a', d)
+        >>> setVar('TEST_append', ' test', d)
+        >>> setVar('TEST_append', ' of the emergency broadcast system.', d)
+        >>> update_data(d)
+        >>> print getVar('TEST', d)
+        this is a test of the emergency broadcast system.
 
-def build_dependencies(key, keys, shelldeps, varflagsexcl, d):
-    deps = set()
-    try:
-        if key[-1] == ']':
-            vf = key[:-1].split('[')
-            value = d.getVarFlag(vf[0], vf[1], False)
-            parser = d.expandWithRefs(value, key)
-            deps |= parser.references
-            deps = deps | (keys & parser.execs)
-            return deps, value
-        varflags = d.getVarFlags(key, ["vardeps", "vardepvalue", "vardepsexclude", "postfuncs", "prefuncs"]) or {}
-        vardeps = varflags.get("vardeps")
-        value = d.getVar(key, False)
+        Prepending to a variable:
+        >>> setVar('TEST', 'virtual/libc', d)
+        >>> setVar('TEST_prepend', 'virtual/tmake ', d)
+        >>> setVar('TEST_prepend', 'virtual/patcher ', d)
+        >>> update_data(d)
+        >>> print getVar('TEST', d)
+        virtual/patcher virtual/tmake virtual/libc
 
-        def handle_contains(value, contains, d):
-            newvalue = ""
-            for k in sorted(contains):
-                l = (d.getVar(k, True) or "").split()
-                for word in sorted(contains[k]):
-                    if word in l:
-                        newvalue += "\n%s{%s} = Set" %  (k, word)
-                    else:
-                        newvalue += "\n%s{%s} = Unset" %  (k, word)
-            if not newvalue:
-                return value
-            if not value:
-                return newvalue
-            return value + newvalue
+        Overrides:
+        >>> setVar('TEST_arm', 'target', d)
+        >>> setVar('TEST_ramses', 'machine', d)
+        >>> setVar('TEST_local', 'local', d)
+        >>> setVar('OVERRIDES', 'arm', d)
 
-        if "vardepvalue" in varflags:
-           value = varflags.get("vardepvalue")
-        elif varflags.get("func"):
-            if varflags.get("python"):
-                parsedvar = d.expandWithRefs(value, key)
-                parser = bb.codeparser.PythonParser(key, logger)
-                if parsedvar.value and "\t" in parsedvar.value:
-                    logger.warn("Variable %s contains tabs, please remove these (%s)" % (key, d.getVar("FILE", True)))
-                parser.parse_python(parsedvar.value)
-                deps = deps | parser.references
-                value = handle_contains(value, parser.contains, d)
-            else:
-                parsedvar = d.expandWithRefs(value, key)
-                parser = bb.codeparser.ShellParser(key, logger)
-                parser.parse_shell(parsedvar.value)
-                deps = deps | shelldeps
-            if vardeps is None:
-                parser.log.flush()
-            if "prefuncs" in varflags:
-                deps = deps | set(varflags["prefuncs"].split())
-            if "postfuncs" in varflags:
-                deps = deps | set(varflags["postfuncs"].split())
-            deps = deps | parsedvar.references
-            deps = deps | (keys & parser.execs) | (keys & parsedvar.execs)
-            value = handle_contains(value, parsedvar.contains, d)
-        else:
-            parser = d.expandWithRefs(value, key)
-            deps |= parser.references
-            deps = deps | (keys & parser.execs)
-            value = handle_contains(value, parser.contains, d)
+        >>> setVar('TEST', 'original', d)
+        >>> update_data(d)
+        >>> print getVar('TEST', d)
+        target
 
-        # Add varflags, assuming an exclusion list is set
-        if varflagsexcl:
-            varfdeps = []
-            for f in varflags:
-                if f not in varflagsexcl:
-                    varfdeps.append('%s[%s]' % (key, f))
-            if varfdeps:
-                deps |= set(varfdeps)
+        >>> setVar('OVERRIDES', 'arm:ramses:local', d)
+        >>> setVar('TEST', 'original', d)
+        >>> update_data(d)
+        >>> print getVar('TEST', d)
+        local
 
-        deps |= set((vardeps or "").split())
-        deps -= set(varflags.get("vardepsexclude", "").split())
-    except Exception as e:
-        raise bb.data_smart.ExpansionError(key, None, e)
-    return deps, value
-    #bb.note("Variable %s references %s and calls %s" % (key, str(deps), str(execs)))
-    #d.setVarFlag(key, "vardeps", deps)
+        CopyMonster:
+        >>> e = d.createCopy()
+        >>> setVar('TEST_foo', 'foo', e)
+        >>> update_data(e)
+        >>> print getVar('TEST', e)
+        local
 
-def generate_dependencies(d):
+        >>> setVar('OVERRIDES', 'arm:ramses:local:foo', e)
+        >>> update_data(e)
+        >>> print getVar('TEST', e)
+        foo
 
-    keys = set(key for key in d if not key.startswith("__"))
-    shelldeps = set(key for key in d.getVar("__exportlist", False) if d.getVarFlag(key, "export") and not d.getVarFlag(key, "unexport"))
-    varflagsexcl = d.getVar('BB_SIGNATURE_EXCLUDE_FLAGS', True)
+        >>> f = d.createCopy()
+        >>> setVar('TEST_moo', 'something', f)
+        >>> setVar('OVERRIDES', 'moo:arm:ramses:local:foo', e)
+        >>> update_data(e)
+        >>> print getVar('TEST', e)
+        foo
 
-    deps = {}
-    values = {}
 
-    tasklist = d.getVar('__BBTASKS') or []
-    for task in tasklist:
-        deps[task], values[task] = build_dependencies(task, keys, shelldeps, varflagsexcl, d)
-        newdeps = deps[task]
-        seen = set()
-        while newdeps:
-            nextdeps = newdeps
-            seen |= nextdeps
-            newdeps = set()
-            for dep in nextdeps:
-                if dep not in deps:
-                    deps[dep], values[dep] = build_dependencies(dep, keys, shelldeps, varflagsexcl, d)
-                newdeps |=  deps[dep]
-            newdeps -= seen
-        #print "For %s: %s" % (task, str(deps[task]))
-    return tasklist, deps, values
+        >>> h = init()
+        >>> setVar('SRC_URI', 'file://append.foo;patch=1 ', h)
+        >>> g = h.createCopy()
+        >>> setVar('SRC_URI_append_arm', 'file://other.foo;patch=1', g)
+        >>> setVar('OVERRIDES', 'arm:moo', g)
+        >>> update_data(g)
+        >>> print getVar('SRC_URI', g)
+        file://append.foo;patch=1 file://other.foo;patch=1
+
+    """
+    bb.msg.debug(2, bb.msg.domain.Data, "update_data()")
+
+    # now ask the cookie monster for help
+    #print "Cookie Monster"
+    #print "Append/Prepend %s" % d._special_values
+    #print "Overrides      %s" % d._seen_overrides
+
+    overrides = (getVar('OVERRIDES', d, 1) or "").split(':') or []
+
+    #
+    # Well let us see what breaks here. We used to iterate
+    # over each variable and apply the override and then
+    # do the line expanding.
+    # If we have bad luck - which we will have - the keys
+    # where in some order that is so important for this
+    # method which we don't have anymore.
+    # Anyway we will fix that and write test cases this
+    # time.
+
+    #
+    # First we apply all overrides
+    # Then  we will handle _append and _prepend
+    #
+
+    for o in overrides:
+        # calculate '_'+override
+        l    = len(o)+1
+
+        # see if one should even try
+        if not d._seen_overrides.has_key(o):
+            continue
+
+        vars = d._seen_overrides[o]
+        for var in vars:
+            name = var[:-l]
+            try:
+                d[name] = d[var]
+            except:
+                bb.msg.note(1, bb.msg.domain.Data, "Untracked delVar")
+
+    # now on to the appends and prepends
+    if d._special_values.has_key('_append'):
+        appends = d._special_values['_append'] or []
+        for append in appends:
+            for (a, o) in getVarFlag(append, '_append', d) or []:
+                # maybe the OVERRIDE was not yet added so keep the append
+                if (o and o in overrides) or not o:
+                    delVarFlag(append, '_append', d)
+                if o and not o in overrides:
+                    continue
+
+                sval = getVar(append,d) or ""
+                sval+=a
+                setVar(append, sval, d)
+
+
+    if d._special_values.has_key('_prepend'):
+        prepends = d._special_values['_prepend'] or []
+
+        for prepend in prepends:
+            for (a, o) in getVarFlag(prepend, '_prepend', d) or []:
+                # maybe the OVERRIDE was not yet added so keep the prepend
+                if (o and o in overrides) or not o:
+                    delVarFlag(prepend, '_prepend', d)
+                if o and not o in overrides:
+                    continue
+
+                sval = a + (getVar(prepend,d) or "")
+                setVar(prepend, sval, d)
+
 
 def inherits_class(klass, d):
     val = getVar('__inherit_cache', d) or []
-    needle = os.path.join('classes', '%s.bbclass' % klass)
-    for v in val:
-        if v.endswith(needle):
-            return True
+    if os.path.join('classes', '%s.bbclass' % klass) in val:
+        return True
     return False
+
+def _test():
+    """Start a doctest run on this module"""
+    import doctest
+    from bb import data
+    doctest.testmod(data)
+
+if __name__ == "__main__":
+    _test()

bitbake/lib/bb/data_smart.py

@@ -28,433 +28,92 @@ BitBake build tools.
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 # Based on functions from the base bb module, Copyright 2003 Holger Schurig
 
-import copy, re, sys, traceback
-from collections import MutableMapping
-import logging
-import hashlib
-import bb, bb.codeparser
-from bb   import utils
-from bb.COW  import COWDictBase
+import copy, os, re, sys, time, types
+import bb
+from bb   import utils, methodpool
+from COW  import COWDictBase
+from sets import Set
+from new  import classobj
 
-logger = logging.getLogger("BitBake.Data")
 
-__setvar_keyword__ = ["_append", "_prepend", "_remove"]
-__setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend|_remove)(_(?P<add>.*))?$')
-__expand_var_regexp__ = re.compile(r"\${[^{}@\n\t ]+}")
+__setvar_keyword__ = ["_append","_prepend"]
+__setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend)(_(?P<add>.*))?')
+__expand_var_regexp__ = re.compile(r"\${[^{}]+}")
 __expand_python_regexp__ = re.compile(r"\${@.+?}")
 
-def infer_caller_details(loginfo, parent = False, varval = True):
-    """Save the caller the trouble of specifying everything."""
-    # Save effort.
-    if 'ignore' in loginfo and loginfo['ignore']:
-        return
-    # If nothing was provided, mark this as possibly unneeded.
-    if not loginfo:
-        loginfo['ignore'] = True
-        return
-    # Infer caller's likely values for variable (var) and value (value), 
-    # to reduce clutter in the rest of the code.
-    if varval and ('variable' not in loginfo or 'detail' not in loginfo):
-        try:
-            raise Exception
-        except Exception:
-            tb = sys.exc_info()[2]
-            if parent:
-                above = tb.tb_frame.f_back.f_back
-            else:
-                above = tb.tb_frame.f_back
-            lcls = above.f_locals.items()
-        for k, v in lcls:
-            if k == 'value' and 'detail' not in loginfo:
-                loginfo['detail'] = v
-            if k == 'var' and 'variable' not in loginfo:
-                loginfo['variable'] = v
-    # Infer file/line/function from traceback
-    if 'file' not in loginfo:
-        depth = 3    
-        if parent:
-            depth = 4
-        file, line, func, text = traceback.extract_stack(limit = depth)[0]
-        loginfo['file'] = file
-        loginfo['line'] = line
-        if func not in loginfo:
-            loginfo['func'] = func
 
-class VariableParse:
-    def __init__(self, varname, d, val = None):
-        self.varname = varname
-        self.d = d
-        self.value = val
-
-        self.references = set()
-        self.execs = set()
-        self.contains = {}
-
-    def var_sub(self, match):
-            key = match.group()[2:-1]
-            if self.varname and key:
-                if self.varname == key:
-                    raise Exception("variable %s references itself!" % self.varname)
-            if key in self.d.expand_cache:
-                varparse = self.d.expand_cache[key]
-                var = varparse.value
-            else:
-                var = self.d.getVarFlag(key, "_content", True)
-            self.references.add(key)
-            if var is not None:
-                return var
-            else:
-                return match.group()
-
-    def python_sub(self, match):
-            code = match.group()[3:-1]
-            codeobj = compile(code.strip(), self.varname or "<expansion>", "eval")
-
-            parser = bb.codeparser.PythonParser(self.varname, logger)
-            parser.parse_python(code)
-            if self.varname:
-                vardeps = self.d.getVarFlag(self.varname, "vardeps", True)
-                if vardeps is None:
-                    parser.log.flush()
-            else:
-                parser.log.flush()
-            self.references |= parser.references
-            self.execs |= parser.execs
-
-            for k in parser.contains:
-                if k not in self.contains:
-                    self.contains[k] = parser.contains[k].copy()
-                else:
-                    self.contains[k].update(parser.contains[k])
-            value = utils.better_eval(codeobj, DataContext(self.d))
-            return str(value)
-
-
-class DataContext(dict):
-    def __init__(self, metadata, **kwargs):
-        self.metadata = metadata
-        dict.__init__(self, **kwargs)
-        self['d'] = metadata
-
-    def __missing__(self, key):
-        value = self.metadata.getVar(key, True)
-        if value is None or self.metadata.getVarFlag(key, 'func'):
-            raise KeyError(key)
-        else:
-            return value
-
-class ExpansionError(Exception):
-    def __init__(self, varname, expression, exception):
-        self.expression = expression
-        self.variablename = varname
-        self.exception = exception
-        if varname:
-            if expression:
-                self.msg = "Failure expanding variable %s, expression was %s which triggered exception %s: %s" % (varname, expression, type(exception).__name__, exception)
-            else:
-                self.msg = "Failure expanding variable %s: %s: %s" % (varname, type(exception).__name__, exception)
-        else:
-            self.msg = "Failure expanding expression %s which triggered exception %s: %s" % (expression, type(exception).__name__, exception)
-        Exception.__init__(self, self.msg)
-        self.args = (varname, expression, exception)
-    def __str__(self):
-        return self.msg
-
-class IncludeHistory(object):
-    def __init__(self, parent = None, filename = '[TOP LEVEL]'):
-        self.parent = parent
-        self.filename = filename
-        self.children = []
-        self.current = self
-
-    def copy(self):
-        new = IncludeHistory(self.parent, self.filename)
-        for c in self.children:
-            new.children.append(c)
-        return new
-
-    def include(self, filename):
-        newfile = IncludeHistory(self.current, filename)
-        self.current.children.append(newfile)
-        self.current = newfile
-        return self
-
-    def __enter__(self):
-        pass
-
-    def __exit__(self, a, b, c):
-        if self.current.parent:
-            self.current = self.current.parent
-        else:
-            bb.warn("Include log: Tried to finish '%s' at top level." % filename)
-        return False
-
-    def emit(self, o, level = 0):
-        """Emit an include history file, and its children."""
-        if level:
-            spaces = "  " * (level - 1)
-            o.write("# %s%s" % (spaces, self.filename))
-            if len(self.children) > 0:
-                o.write(" includes:")
-        else:
-            o.write("#\n# INCLUDE HISTORY:\n#")
-        level = level + 1
-        for child in self.children:
-            o.write("\n")
-            child.emit(o, level)
-
-class VariableHistory(object):
-    def __init__(self, dataroot):
-        self.dataroot = dataroot
-        self.variables = COWDictBase.copy()
-
-    def copy(self):
-        new = VariableHistory(self.dataroot)
-        new.variables = self.variables.copy()
-        return new
-
-    def record(self, *kwonly, **loginfo):
-        if not self.dataroot._tracking:
-            return
-        if len(kwonly) > 0:
-            raise TypeError
-        infer_caller_details(loginfo, parent = True)
-        if 'ignore' in loginfo and loginfo['ignore']:
-            return
-        if 'op' not in loginfo or not loginfo['op']:
-            loginfo['op'] = 'set'
-        if 'detail' in loginfo:
-            loginfo['detail'] = str(loginfo['detail'])
-        if 'variable' not in loginfo or 'file' not in loginfo:
-            raise ValueError("record() missing variable or file.")
-        var = loginfo['variable']
-
-        if var not in self.variables:
-            self.variables[var] = []
-        self.variables[var].append(loginfo.copy())
-
-    def variable(self, var):
-        if var in self.variables:
-            return self.variables[var]
-        else:
-            return []
-
-    def emit(self, var, oval, val, o):
-        history = self.variable(var)
-        commentVal = re.sub('\n', '\n#', str(oval))
-        if history:
-            if len(history) == 1:
-                o.write("#\n# $%s\n" % var)
-            else:
-                o.write("#\n# $%s [%d operations]\n" % (var, len(history)))
-            for event in history:
-                # o.write("# %s\n" % str(event))
-                if 'func' in event:
-                    # If we have a function listed, this is internal
-                    # code, not an operation in a config file, and the
-                    # full path is distracting.
-                    event['file'] = re.sub('.*/', '', event['file'])
-                    display_func = ' [%s]' % event['func']
-                else:
-                    display_func = ''
-                if 'flag' in event:
-                    flag = '[%s] ' % (event['flag'])
-                else:
-                    flag = ''
-                o.write("#   %s %s:%s%s\n#     %s\"%s\"\n" % (event['op'], event['file'], event['line'], display_func, flag, re.sub('\n', '\n#     ', event['detail'])))
-            if len(history) > 1:
-                o.write("# computed:\n")
-                o.write('#   "%s"\n' % (commentVal))
-        else:
-            o.write("#\n# $%s\n#   [no history recorded]\n#\n" % var)
-            o.write('#   "%s"\n' % (commentVal))
-
-    def get_variable_files(self, var):
-        """Get the files where operations are made on a variable"""
-        var_history = self.variable(var)
-        files = []
-        for event in var_history:
-            files.append(event['file'])
-        return files
-
-    def get_variable_lines(self, var, f):
-        """Get the line where a operation is made on a variable in file f"""
-        var_history = self.variable(var)
-        lines = []
-        for event in var_history:
-            if f== event['file']:
-                line = event['line']
-                lines.append(line)
-        return lines
-
-    def del_var_history(self, var, f=None, line=None):
-        """If file f and line are not given, the entire history of var is deleted"""
-        if var in self.variables:
-            if f and line:
-                self.variables[var] = [ x for x in self.variables[var] if x['file']!=f and x['line']!=line]
-            else:
-                self.variables[var] = []
-
-class DataSmart(MutableMapping):
+class DataSmart:
     def __init__(self, special = COWDictBase.copy(), seen = COWDictBase.copy() ):
         self.dict = {}
 
-        self.inchistory = IncludeHistory()
-        self.varhistory = VariableHistory(self)
-        self._tracking = False
-
         # cookie monster tribute
         self._special_values = special
         self._seen_overrides = seen
 
         self.expand_cache = {}
 
-    def enableTracking(self):
-        self._tracking = True
+    def expand(self,s, varname):
+        def var_sub(match):
+            key = match.group()[2:-1]
+            if varname and key:
+                if varname == key:
+                    raise Exception("variable %s references itself!" % varname)
+            var = self.getVar(key, 1)
+            if var is not None:
+                return var
+            else:
+                return match.group()
 
-    def disableTracking(self):
-        self._tracking = False
+        def python_sub(match):
+            import bb
+            code = match.group()[3:-1]
+            locals()['d'] = self
+            s = eval(code)
+            if type(s) == types.IntType: s = str(s)
+            return s
 
-    def expandWithRefs(self, s, varname):
-
-        if not isinstance(s, basestring): # sanity check
-            return VariableParse(varname, self, s)
+        if type(s) is not types.StringType: # sanity check
+            return s
 
         if varname and varname in self.expand_cache:
             return self.expand_cache[varname]
 
-        varparse = VariableParse(varname, self)
-
         while s.find('${') != -1:
             olds = s
             try:
-                s = __expand_var_regexp__.sub(varparse.var_sub, s)
-                s = __expand_python_regexp__.sub(varparse.python_sub, s)
-                if s == olds:
-                    break
-            except ExpansionError:
+                s = __expand_var_regexp__.sub(var_sub, s)
+                s = __expand_python_regexp__.sub(python_sub, s)
+                if s == olds: break
+                if type(s) is not types.StringType: # sanity check
+                    bb.msg.error(bb.msg.domain.Data, 'expansion of %s returned non-string %s' % (olds, s))
+            except KeyboardInterrupt:
                 raise
-            except bb.parse.SkipPackage:
+            except:
+                bb.msg.note(1, bb.msg.domain.Data, "%s:%s while evaluating:\n%s" % (sys.exc_info()[0], sys.exc_info()[1], s))
                 raise
-            except Exception as exc:
-                raise ExpansionError(varname, s, exc)
-
-        varparse.value = s
 
         if varname:
-            self.expand_cache[varname] = varparse
+            self.expand_cache[varname] = s
 
-        return varparse
-
-    def expand(self, s, varname = None):
-        return self.expandWithRefs(s, varname).value
-
-
-    def finalize(self, parent = False):
-        """Performs final steps upon the datastore, including application of overrides"""
-
-        overrides = (self.getVar("OVERRIDES", True) or "").split(":") or []
-        finalize_caller = {
-            'op': 'finalize',
-        }
-        infer_caller_details(finalize_caller, parent = parent, varval = False)
-
-        #
-        # Well let us see what breaks here. We used to iterate
-        # over each variable and apply the override and then
-        # do the line expanding.
-        # If we have bad luck - which we will have - the keys
-        # where in some order that is so important for this
-        # method which we don't have anymore.
-        # Anyway we will fix that and write test cases this
-        # time.
-
-        #
-        # First we apply all overrides
-        # Then we will handle _append and _prepend and store the _remove
-        # information for later.
-        #
-
-        # We only want to report finalization once per variable overridden.
-        finalizes_reported = {}
-
-        for o in overrides:
-            # calculate '_'+override
-            l = len(o) + 1
-
-            # see if one should even try
-            if o not in self._seen_overrides:
-                continue
-
-            vars = self._seen_overrides[o].copy()
-            for var in vars:
-                name = var[:-l]
-                try:
-                    # Report only once, even if multiple changes.
-                    if name not in finalizes_reported:
-                        finalizes_reported[name] = True
-                        finalize_caller['variable'] = name
-                        finalize_caller['detail'] = 'was: ' + str(self.getVar(name, False))
-                        self.varhistory.record(**finalize_caller)
-                    # Copy history of the override over.
-                    for event in self.varhistory.variable(var):
-                        loginfo = event.copy()
-                        loginfo['variable'] = name
-                        loginfo['op'] = 'override[%s]:%s' % (o, loginfo['op'])
-                        self.varhistory.record(**loginfo)
-                    self.setVar(name, self.getVar(var, False), op = 'finalize', file = 'override[%s]' % o, line = '')
-                    self.delVar(var)
-                except Exception:
-                    logger.info("Untracked delVar")
-
-        # now on to the appends and prepends, and stashing the removes
-        for op in __setvar_keyword__:
-            if op in self._special_values:
-                appends = self._special_values[op] or []
-                for append in appends:
-                    keep = []
-                    for (a, o) in self.getVarFlag(append, op) or []:
-                        match = True
-                        if o:
-                            for o2 in o.split("_"):
-                                if not o2 in overrides:
-                                    match = False
-                        if not match:
-                            keep.append((a ,o))
-                            continue
-
-                        if op == "_append":
-                            sval = self.getVar(append, False) or ""
-                            sval += a
-                            self.setVar(append, sval)
-                        elif op == "_prepend":
-                            sval = a + (self.getVar(append, False) or "")
-                            self.setVar(append, sval)
-                        elif op == "_remove":
-                            removes = self.getVarFlag(append, "_removeactive", False) or []
-                            removes.extend(a.split())
-                            self.setVarFlag(append, "_removeactive", removes, ignore=True)
-
-                    # We save overrides that may be applied at some later stage
-                    if keep:
-                        self.setVarFlag(append, op, keep, ignore=True)
-                    else:
-                        self.delVarFlag(append, op, ignore=True)
+        return s
 
     def initVar(self, var):
         self.expand_cache = {}
         if not var in self.dict:
             self.dict[var] = {}
 
-    def _findVar(self, var):
-        dest = self.dict
-        while dest:
-            if var in dest:
-                return dest[var]
+    def _findVar(self,var):
+        _dest = self.dict
 
-            if "_data" not in dest:
+        while (_dest and var not in _dest):
+            if not "_data" in _dest:
+                _dest = None
                 break
-            dest = dest["_data"]
+            _dest = _dest["_data"]
+
+        if _dest and var in _dest:
+            return _dest[var]
+        return None
 
     def _makeShadowCopy(self, var):
         if var in self.dict:
@@ -467,11 +126,7 @@ class DataSmart(MutableMapping):
         else:
             self.initVar(var)
 
-
-    def setVar(self, var, value, **loginfo):
-        #print("var=" + str(var) + "  val=" + str(value))
-        if 'op' not in loginfo:
-            loginfo['op'] = "set"
+    def setVar(self,var,value):
         self.expand_cache = {}
         match  = __setvar_regexp__.match(var)
         if match and match.group("keyword") in __setvar_keyword__:
@@ -480,143 +135,80 @@ class DataSmart(MutableMapping):
             override = match.group('add')
             l = self.getVarFlag(base, keyword) or []
             l.append([value, override])
-            self.setVarFlag(base, keyword, l, ignore=True)
-            # And cause that to be recorded:
-            loginfo['detail'] = value
-            loginfo['variable'] = base
-            if override:
-                loginfo['op'] = '%s[%s]' % (keyword, override)
-            else:
-                loginfo['op'] = keyword
-            self.varhistory.record(**loginfo)
+            self.setVarFlag(base, keyword, l)
+
             # todo make sure keyword is not __doc__ or __module__
             # pay the cookie monster
             try:
-                self._special_values[keyword].add(base)
-            except KeyError:
-                self._special_values[keyword] = set()
-                self._special_values[keyword].add(base)
+                self._special_values[keyword].add( base )
+            except:
+                self._special_values[keyword] = Set()
+                self._special_values[keyword].add( base )
 
             return
 
         if not var in self.dict:
             self._makeShadowCopy(var)
+        if self.getVarFlag(var, 'matchesenv'):
+            self.delVarFlag(var, 'matchesenv')
+            self.setVarFlag(var, 'export', 1)
 
         # more cookies for the cookie monster
         if '_' in var:
-            self._setvar_update_overrides(var)
-
-        # setting var
-        self.dict[var]["_content"] = value
-        self.varhistory.record(**loginfo)
-
-    def _setvar_update_overrides(self, var):
-        # aka pay the cookie monster
-        override = var[var.rfind('_')+1:]
-        if len(override) > 0:
-            if override not in self._seen_overrides:
-                self._seen_overrides[override] = set()
+            override = var[var.rfind('_')+1:]
+            if not self._seen_overrides.has_key(override):
+                self._seen_overrides[override] = Set()
             self._seen_overrides[override].add( var )
 
-    def getVar(self, var, expand=False, noweakdefault=False):
-        return self.getVarFlag(var, "_content", expand, noweakdefault)
+        # setting var
+        self.dict[var]["content"] = value
 
-    def renameVar(self, key, newkey, **loginfo):
+    def getVar(self,var,exp):
+        value = self.getVarFlag(var,"content")
+
+        if exp and value:
+            return self.expand(value,var)
+        return value
+
+    def renameVar(self, key, newkey):
         """
-        Rename the variable key to newkey
+        Rename the variable key to newkey 
         """
         val = self.getVar(key, 0)
-        if val is not None:
-            loginfo['variable'] = newkey
-            loginfo['op'] = 'rename from %s' % key
-            loginfo['detail'] = val
-            self.varhistory.record(**loginfo)
-            self.setVar(newkey, val, ignore=True)
+        if val is None:
+            return
 
-        for i in (__setvar_keyword__):
-            src = self.getVarFlag(key, i)
-            if src is None:
-                continue
+        self.setVar(newkey, val)
 
+        for i in ('_append', '_prepend'):
             dest = self.getVarFlag(newkey, i) or []
+            src = self.getVarFlag(key, i) or []
             dest.extend(src)
-            self.setVarFlag(newkey, i, dest, ignore=True)
-
-            if i in self._special_values and key in self._special_values[i]:
+            self.setVarFlag(newkey, i, dest)
+            
+            if self._special_values.has_key(i) and key in self._special_values[i]:
                 self._special_values[i].remove(key)
                 self._special_values[i].add(newkey)
 
-        loginfo['variable'] = key
-        loginfo['op'] = 'rename (to)'
-        loginfo['detail'] = newkey
-        self.varhistory.record(**loginfo)
-        self.delVar(key, ignore=True)
+        self.delVar(key)
 
-    def appendVar(self, var, value, **loginfo):
-        loginfo['op'] = 'append'
-        self.varhistory.record(**loginfo)
-        newvalue = (self.getVar(var, False) or "") + value
-        self.setVar(var, newvalue, ignore=True)
-
-    def prependVar(self, var, value, **loginfo):
-        loginfo['op'] = 'prepend'
-        self.varhistory.record(**loginfo)
-        newvalue = value + (self.getVar(var, False) or "")
-        self.setVar(var, newvalue, ignore=True)
-
-    def delVar(self, var, **loginfo):
-        loginfo['detail'] = ""
-        loginfo['op'] = 'del'
-        self.varhistory.record(**loginfo)
+    def delVar(self,var):
         self.expand_cache = {}
         self.dict[var] = {}
-        if '_' in var:
-            override = var[var.rfind('_')+1:]
-            if override and override in self._seen_overrides and var in self._seen_overrides[override]:
-                self._seen_overrides[override].remove(var)
 
-    def setVarFlag(self, var, flag, value, **loginfo):
-        if 'op' not in loginfo:
-            loginfo['op'] = "set"
-        loginfo['flag'] = flag
-        self.varhistory.record(**loginfo)
+    def setVarFlag(self,var,flag,flagvalue):
         if not var in self.dict:
             self._makeShadowCopy(var)
-        self.dict[var][flag] = value
+        self.dict[var][flag] = flagvalue
 
-        if flag == "defaultval" and '_' in var:
-            self._setvar_update_overrides(var)
-
-        if flag == "unexport" or flag == "export":
-            if not "__exportlist" in self.dict:
-                self._makeShadowCopy("__exportlist")
-            if not "_content" in self.dict["__exportlist"]:
-                self.dict["__exportlist"]["_content"] = set()
-            self.dict["__exportlist"]["_content"].add(var)
-
-    def getVarFlag(self, var, flag, expand=False, noweakdefault=False):
+    def getVarFlag(self,var,flag):
         local_var = self._findVar(var)
-        value = None
-        if local_var is not None:
+        if local_var:
             if flag in local_var:
-                value = copy.copy(local_var[flag])
-            elif flag == "_content" and "defaultval" in local_var and not noweakdefault:
-                value = copy.copy(local_var["defaultval"])
-        if expand and value:
-            # Only getvar (flag == _content) hits the expand cache
-            cachename = None
-            if flag == "_content":
-                cachename = var
-            else:
-                cachename = var + "[" + flag + "]"
-            value = self.expand(value, cachename)
-        if value is not None and flag == "_content" and local_var is not None and "_removeactive" in local_var:
-            filtered = filter(lambda v: v not in local_var["_removeactive"],
-                              value.split(" "))
-            value = " ".join(filtered)
-        return value
+                return copy.copy(local_var[flag])
+        return None
 
-    def delVarFlag(self, var, flag, **loginfo):
+    def delVarFlag(self,var,flag):
         local_var = self._findVar(var)
         if not local_var:
             return
@@ -624,71 +216,44 @@ class DataSmart(MutableMapping):
             self._makeShadowCopy(var)
 
         if var in self.dict and flag in self.dict[var]:
-            loginfo['detail'] = ""
-            loginfo['op'] = 'delFlag'
-            loginfo['flag'] = flag
-            self.varhistory.record(**loginfo)
-
             del self.dict[var][flag]
 
-    def appendVarFlag(self, var, flag, value, **loginfo):
-        loginfo['op'] = 'append'
-        loginfo['flag'] = flag
-        self.varhistory.record(**loginfo)
-        newvalue = (self.getVarFlag(var, flag, False) or "") + value
-        self.setVarFlag(var, flag, newvalue, ignore=True)
-
-    def prependVarFlag(self, var, flag, value, **loginfo):
-        loginfo['op'] = 'prepend'
-        loginfo['flag'] = flag
-        self.varhistory.record(**loginfo)
-        newvalue = value + (self.getVarFlag(var, flag, False) or "")
-        self.setVarFlag(var, flag, newvalue, ignore=True)
-
-    def setVarFlags(self, var, flags, **loginfo):
-        infer_caller_details(loginfo)
+    def setVarFlags(self,var,flags):
         if not var in self.dict:
             self._makeShadowCopy(var)
 
-        for i in flags:
-            if i == "_content":
+        for i in flags.keys():
+            if i == "content":
                 continue
-            loginfo['flag'] = i
-            loginfo['detail'] = flags[i]
-            self.varhistory.record(**loginfo)
             self.dict[var][i] = flags[i]
 
-    def getVarFlags(self, var, expand = False, internalflags=False):
+    def getVarFlags(self,var):
         local_var = self._findVar(var)
         flags = {}
 
         if local_var:
-            for i in local_var:
-                if i.startswith("_") and not internalflags:
+            for i in local_var.keys():
+                if i == "content":
                     continue
                 flags[i] = local_var[i]
-                if expand and i in expand:
-                    flags[i] = self.expand(flags[i], var + "[" + i + "]")
+
         if len(flags) == 0:
             return None
         return flags
 
 
-    def delVarFlags(self, var, **loginfo):
+    def delVarFlags(self,var):
         if not var in self.dict:
             self._makeShadowCopy(var)
 
         if var in self.dict:
             content = None
 
-            loginfo['op'] = 'delete flags'
-            self.varhistory.record(**loginfo)
-
             # try to save the content
-            if "_content" in self.dict[var]:
-                content  = self.dict[var]["_content"]
+            if "content" in self.dict[var]:
+                content  = self.dict[var]["content"]
                 self.dict[var]            = {}
-                self.dict[var]["_content"] = content
+                self.dict[var]["content"] = content
             else:
                 del self.dict[var]
 
@@ -700,101 +265,28 @@ class DataSmart(MutableMapping):
         # we really want this to be a DataSmart...
         data = DataSmart(seen=self._seen_overrides.copy(), special=self._special_values.copy())
         data.dict["_data"] = self.dict
-        data.varhistory = self.varhistory.copy()
-        data.varhistory.datasmart = data
-        data.inchistory = self.inchistory.copy()
-
-        data._tracking = self._tracking
 
         return data
 
-    def expandVarref(self, variable, parents=False):
-        """Find all references to variable in the data and expand it
-           in place, optionally descending to parent datastores."""
-
-        if parents:
-            keys = iter(self)
-        else:
-            keys = self.localkeys()
-
-        ref = '${%s}' % variable
-        value = self.getVar(variable, False)
-        for key in keys:
-            referrervalue = self.getVar(key, False)
-            if referrervalue and ref in referrervalue:
-                self.setVar(key, referrervalue.replace(ref, value))
-
-    def localkeys(self):
-        for key in self.dict:
-            if key != '_data':
-                yield key
-
-    def __iter__(self):
-        def keylist(d):        
-            klist = set()
-            for key in d:
-                if key == "_data":
-                    continue
-                if not d[key]:
-                    continue
-                klist.add(key)
-
+    # Dictionary Methods
+    def keys(self):
+        def _keys(d, mykey):
             if "_data" in d:
-                klist |= keylist(d["_data"])
+                _keys(d["_data"],mykey)
 
-            return klist
+            for key in d.keys():
+                if key != "_data":
+                    mykey[key] = None
+        keytab = {}
+        _keys(self.dict,keytab)
+        return keytab.keys()
 
-        for k in keylist(self.dict):
-             yield k
+    def __getitem__(self,item):
+        #print "Warning deprecated"
+        return self.getVar(item, False)
 
-    def __len__(self):
-        return len(frozenset(self))
+    def __setitem__(self,var,data):
+        #print "Warning deprecated"
+        self.setVar(var,data)
 
-    def __getitem__(self, item):
-        value = self.getVar(item, False)
-        if value is None:
-            raise KeyError(item)
-        else:
-            return value
 
-    def __setitem__(self, var, value):
-        self.setVar(var, value)
-
-    def __delitem__(self, var):
-        self.delVar(var)
-
-    def get_hash(self):
-        data = {}
-        d = self.createCopy()
-        bb.data.expandKeys(d)
-        bb.data.update_data(d)
-
-        config_whitelist = set((d.getVar("BB_HASHCONFIG_WHITELIST", True) or "").split())
-        keys = set(key for key in iter(d) if not key.startswith("__"))
-        for key in keys:
-            if key in config_whitelist:
-                continue
-
-            value = d.getVar(key, False) or ""
-            data.update({key:value})
-
-            varflags = d.getVarFlags(key, internalflags = True)
-            if not varflags:
-                continue
-            for f in varflags:
-                if f == "_content":
-                    continue
-                data.update({'%s[%s]' % (key, f):varflags[f]})
-
-        for key in ["__BBTASKS", "__BBANONFUNCS", "__BBHANDLERS"]:
-            bb_list = d.getVar(key, False) or []
-            bb_list.sort()
-            data.update({key:str(bb_list)})
-
-            if key == "__BBANONFUNCS":
-                for i in bb_list:
-                    value = d.getVar(i, True) or ""
-                    data.update({i:value})
-
-        data_str = str([(k, data[k]) for k in sorted(data.keys())])
-        return hashlib.md5(data_str).hexdigest()

bitbake/lib/bb/event.py

@@ -22,233 +22,100 @@ BitBake build tools.
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-import os, sys
-import warnings
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
-import logging
-import atexit
-import traceback
+import os, re
 import bb.utils
-import bb.compat
-import bb.exceptions
 
-# This is the pid for which we should generate the event. This is set when
-# the runqueue forks off.
-worker_pid = 0
-worker_fire = None
-
-logger = logging.getLogger('BitBake.Event')
-
-class Event(object):
+class Event:
     """Base class for events"""
+    type = "Event"
 
-    def __init__(self):
-        self.pid = worker_pid
+    def __init__(self, d):
+        self._data = d
+
+    def getData(self):
+        return self._data
+
+    def setData(self, data):
+        self._data = data
+
+    data = property(getData, setData, None, "data property")
+
+NotHandled = 0
+Handled = 1
 
 Registered        = 10
 AlreadyRegistered = 14
 
-def get_class_handlers():
-    return _handlers
-
-def set_class_handlers(h):
-    _handlers = h
-
-def clean_class_handlers():
-    return bb.compat.OrderedDict()
-
 # Internal
-_handlers = clean_class_handlers()
-_ui_handlers = {}
-_ui_logfilters = {}
-_ui_handler_seq = 0
-_event_handler_map = {}
-_catchall_handlers = {}
+_handlers = []
+_handlers_dict = {}
 
-def execute_handler(name, handler, event, d):
-    event.data = d
-    try:
-        ret = handler(event)
-    except bb.parse.SkipPackage:
-        raise
-    except Exception:
-        etype, value, tb = sys.exc_info()
-        logger.error("Execution of event handler '%s' failed" % name,
-                        exc_info=(etype, value, tb.tb_next))
-        raise
-    except SystemExit as exc:
-        if exc.code != 0:
-            logger.error("Execution of event handler '%s' failed" % name)
-        raise
-    finally:
-        del event.data
+def tmpHandler(event):
+    """Default handler for code events"""
+    return NotHandled
 
-def fire_class_handlers(event, d):
-    if isinstance(event, logging.LogRecord):
-        return
+def defaultTmpHandler():
+    tmp = "def tmpHandler(e):\n\t\"\"\"heh\"\"\"\n\treturn NotHandled"
+    comp = bb.utils.better_compile(tmp, "tmpHandler(e)", "bb.event.defaultTmpHandler")
+    return comp
 
-    eid = str(event.__class__)[8:-2]
-    evt_hmap = _event_handler_map.get(eid, {})
-    for name, handler in _handlers.iteritems():
-        if name in _catchall_handlers or name in evt_hmap:
-            try:
-                execute_handler(name, handler, event, d)
-            except Exception:
-                continue
-
-ui_queue = []
-@atexit.register
-def print_ui_queue():
-    """If we're exiting before a UI has been spawned, display any queued
-    LogRecords to the console."""
-    logger = logging.getLogger("BitBake")
-    if not _ui_handlers:
-        from bb.msg import BBLogFormatter
-        console = logging.StreamHandler(sys.stdout)
-        console.setFormatter(BBLogFormatter("%(levelname)s: %(message)s"))
-        logger.handlers = [console]
-
-        # First check to see if we have any proper messages
-        msgprint = False
-        for event in ui_queue:
-            if isinstance(event, logging.LogRecord):
-                if event.levelno > logging.DEBUG:
-                    logger.handle(event)
-                    msgprint = True
-        if msgprint:
-            return
-
-        # Nope, so just print all of the messages we have (including debug messages)
-        for event in ui_queue:
-            if isinstance(event, logging.LogRecord):
-                logger.handle(event)
-
-def fire_ui_handlers(event, d):
-    if not _ui_handlers:
-        # No UI handlers registered yet, queue up the messages
-        ui_queue.append(event)
-        return
-
-    errors = []
-    for h in _ui_handlers:
-        #print "Sending event %s" % event
-        try:
-             if not _ui_logfilters[h].filter(event):
-                 continue
-             # We use pickle here since it better handles object instances
-             # which xmlrpc's marshaller does not. Events *must* be serializable
-             # by pickle.
-             if hasattr(_ui_handlers[h].event, "sendpickle"):
-                _ui_handlers[h].event.sendpickle((pickle.dumps(event)))
-             else:
-                _ui_handlers[h].event.send(event)
-        except:
-            errors.append(h)
-    for h in errors:
-        del _ui_handlers[h]
-
-def fire(event, d):
+def fire(event):
     """Fire off an Event"""
+    for h in _handlers:
+        if type(h).__name__ == "code":
+            exec(h)
+            if tmpHandler(event) == Handled:
+                return Handled
+        else:
+            if h(event) == Handled:
+                return Handled
+    return NotHandled
 
-    # We can fire class handlers in the worker process context and this is
-    # desired so they get the task based datastore.
-    # UI handlers need to be fired in the server context so we defer this. They
-    # don't have a datastore so the datastore context isn't a problem.
-
-    fire_class_handlers(event, d)
-    if worker_fire:
-        worker_fire(event, d)
-    else:
-        fire_ui_handlers(event, d)
-
-def fire_from_worker(event, d):
-    fire_ui_handlers(event, d)
-
-noop = lambda _: None
-def register(name, handler, mask=[]):
+def register(name, handler):
     """Register an Event handler"""
 
     # already registered
-    if name in _handlers:
+    if name in _handlers_dict:
         return AlreadyRegistered
 
     if handler is not None:
-        # handle string containing python code
-        if isinstance(handler, basestring):
-            tmp = "def %s(e):\n%s" % (name, handler)
-            try:
-                code = compile(tmp, "%s(e)" % name, "exec")
-            except SyntaxError:
-                logger.error("Unable to register event handler '%s':\n%s", name,
-                             ''.join(traceback.format_exc(limit=0)))
-                _handlers[name] = noop
-                return
-            env = {}
-            bb.utils.better_exec(code, env)
-            func = bb.utils.better_eval(name, env)
-            _handlers[name] = func
+#       handle string containing python code
+        if type(handler).__name__ == "str":
+            _registerCode(handler)
         else:
-            _handlers[name] = handler
-
-        if not mask or '*' in mask:
-            _catchall_handlers[name] = True
-        else:
-            for m in mask:
-                if _event_handler_map.get(m, None) is None:
-                    _event_handler_map[m] = {}
-                _event_handler_map[m][name] = True
+            _handlers.append(handler)
 
+        _handlers_dict[name] = 1
         return Registered
 
+def _registerCode(handlerStr):
+    """Register a 'code' Event.
+       Deprecated interface; call register instead.
+
+       Expects to be passed python code as a string, which will
+       be passed in turn to compile() and then exec().  Note that
+       the code will be within a function, so should have had
+       appropriate tabbing put in place."""
+    tmp = "def tmpHandler(e):\n%s" % handlerStr
+    comp = bb.utils.better_compile(tmp, "tmpHandler(e)", "bb.event._registerCode")
+#   prevent duplicate registration
+    _handlers.append(comp)
+
 def remove(name, handler):
     """Remove an Event handler"""
-    _handlers.pop(name)
 
-def register_UIHhandler(handler):
-    bb.event._ui_handler_seq = bb.event._ui_handler_seq + 1
-    _ui_handlers[_ui_handler_seq] = handler
-    level, debug_domains = bb.msg.constructLogOptions()
-    _ui_logfilters[_ui_handler_seq] = UIEventFilter(level, debug_domains)
-    return _ui_handler_seq
-
-def unregister_UIHhandler(handlerNum):
-    if handlerNum in _ui_handlers:
-        del _ui_handlers[handlerNum]
-    return
-
-# Class to allow filtering of events and specific filtering of LogRecords *before* we put them over the IPC
-class UIEventFilter(object):
-    def __init__(self, level, debug_domains):
-        self.update(None, level, debug_domains)
-
-    def update(self, eventmask, level, debug_domains):
-        self.eventmask = eventmask
-        self.stdlevel = level
-        self.debug_domains = debug_domains
-
-    def filter(self, event):
-        if isinstance(event, logging.LogRecord):
-            if event.levelno >= self.stdlevel:
-                return True
-            if event.name in self.debug_domains and event.levelno >= self.debug_domains[event.name]:
-                return True
-            return False
-        eid = str(event.__class__)[8:-2]
-        if self.eventmask and eid not in self.eventmask:
-            return False
-        return True
-
-def set_UIHmask(handlerNum, level, debug_domains, mask):
-    if not handlerNum in _ui_handlers:
-        return False
-    if '*' in mask:
-        _ui_logfilters[handlerNum].update(None, level, debug_domains)
+    _handlers_dict.pop(name)
+    if type(handler).__name__ == "str":
+        return _removeCode(handler)
     else:
-        _ui_logfilters[handlerNum].update(mask, level, debug_domains)
-    return True
+        _handlers.remove(handler)
+
+def _removeCode(handlerStr):
+    """Remove a 'code' Event handler
+       Deprecated interface; call remove instead."""
+    tmp = "def tmpHandler(e):\n%s" % handlerStr
+    comp = bb.utils.better_compile(tmp, "tmpHandler(e)", "bb.event._removeCode")
+    _handlers.remove(comp)
 
 def getName(e):
     """Returns the name of a class or class instance"""
@@ -257,48 +124,16 @@ def getName(e):
     else:
         return e.__name__
 
-class OperationStarted(Event):
-    """An operation has begun"""
-    def __init__(self, msg = "Operation Started"):
-        Event.__init__(self)
-        self.msg = msg
-
-class OperationCompleted(Event):
-    """An operation has completed"""
-    def __init__(self, total, msg = "Operation Completed"):
-        Event.__init__(self)
-        self.total = total
-        self.msg = msg
-
-class OperationProgress(Event):
-    """An operation is in progress"""
-    def __init__(self, current, total, msg = "Operation in Progress"):
-        Event.__init__(self)
-        self.current = current
-        self.total = total
-        self.msg = msg + ": %s/%s" % (current, total);
-
 class ConfigParsed(Event):
     """Configuration Parsing Complete"""
 
-class RecipeEvent(Event):
-    def __init__(self, fn):
-        self.fn = fn
-        Event.__init__(self)
-
-class RecipePreFinalise(RecipeEvent):
-    """ Recipe Parsing Complete but not yet finialised"""
-
-class RecipeParsed(RecipeEvent):
-    """ Recipe Parsing Complete """
-
 class StampUpdate(Event):
     """Trigger for any adjustment of the stamp files to happen"""
 
-    def __init__(self, targets, stampfns):
+    def __init__(self, targets, stampfns, d):
         self._targets = targets
         self._stampfns = stampfns
-        Event.__init__(self)
+        Event.__init__(self, d)
 
     def getStampPrefix(self):
         return self._stampfns
@@ -309,13 +144,29 @@ class StampUpdate(Event):
     stampPrefix = property(getStampPrefix)
     targets = property(getTargets)
 
+class PkgBase(Event):
+    """Base class for package events"""
+
+    def __init__(self, t, d):
+        self._pkg = t
+        Event.__init__(self, d)
+
+    def getPkg(self):
+        return self._pkg
+
+    def setPkg(self, pkg):
+        self._pkg = pkg
+
+    pkg = property(getPkg, setPkg, None, "pkg property")
+
+
 class BuildBase(Event):
     """Base class for bbmake run events"""
 
-    def __init__(self, n, p, failures = 0):
+    def __init__(self, n, p, c, failures = 0):
         self._name = n
         self._pkgs = p
-        Event.__init__(self)
+        Event.__init__(self, c)
         self._failures = failures
 
     def getPkgs(self):
@@ -347,43 +198,56 @@ class BuildBase(Event):
     cfg = property(getCfg, setCfg, None, "cfg property")
 
 
+class DepBase(PkgBase):
+    """Base class for dependency events"""
+
+    def __init__(self, t, data, d):
+        self._dep = d
+        PkgBase.__init__(self, t, data)
+
+    def getDep(self):
+        return self._dep
+
+    def setDep(self, dep):
+        self._dep = dep
+
+    dep = property(getDep, setDep, None, "dep property")
 
 
+class PkgStarted(PkgBase):
+    """Package build started"""
 
-class BuildStarted(BuildBase, OperationStarted):
+
+class PkgFailed(PkgBase):
+    """Package build failed"""
+
+
+class PkgSucceeded(PkgBase):
+    """Package build completed"""
+
+
+class BuildStarted(BuildBase):
     """bbmake build run started"""
-    def __init__(self, n, p, failures = 0):
-        OperationStarted.__init__(self, "Building Started")
-        BuildBase.__init__(self, n, p, failures)
 
-class BuildCompleted(BuildBase, OperationCompleted):
+
+class BuildCompleted(BuildBase):
     """bbmake build run completed"""
-    def __init__(self, total, n, p, failures = 0):
-        if not failures:
-            OperationCompleted.__init__(self, total, "Building Succeeded")
-        else:
-            OperationCompleted.__init__(self, total, "Building Failed")
-        BuildBase.__init__(self, n, p, failures)
 
-class DiskFull(Event):
-    """Disk full case build aborted"""
-    def __init__(self, dev, type, freespace, mountpoint):
-        Event.__init__(self)
-        self._dev = dev
-        self._type = type
-        self._free = freespace
-        self._mountpoint = mountpoint
+
+class UnsatisfiedDep(DepBase):
+    """Unsatisfied Dependency"""
+
+
+class RecursiveDep(DepBase):
+    """Recursive Dependency"""
 
 class NoProvider(Event):
     """No Provider for an Event"""
 
-    def __init__(self, item, runtime=False, dependees=None, reasons=[], close_matches=[]):
-        Event.__init__(self)
+    def __init__(self, item, data,runtime=False):
+        Event.__init__(self, data)
         self._item = item
         self._runtime = runtime
-        self._dependees = dependees
-        self._reasons = reasons
-        self._close_matches = close_matches
 
     def getItem(self):
         return self._item
@@ -394,8 +258,8 @@ class NoProvider(Event):
 class MultipleProviders(Event):
     """Multiple Providers"""
 
-    def  __init__(self, item, candidates, runtime = False):
-        Event.__init__(self)
+    def  __init__(self, item, candidates, data, runtime = False):
+        Event.__init__(self, data)
         self._item = item
         self._candidates = candidates
         self._is_runtime = runtime
@@ -417,219 +281,3 @@ class MultipleProviders(Event):
         Get the possible Candidates for a PROVIDER.
         """
         return self._candidates
-
-class ParseStarted(OperationStarted):
-    """Recipe parsing for the runqueue has begun"""
-    def __init__(self, total):
-        OperationStarted.__init__(self, "Recipe parsing Started")
-        self.total = total
-
-class ParseCompleted(OperationCompleted):
-    """Recipe parsing for the runqueue has completed"""
-    def __init__(self, cached, parsed, skipped, masked, virtuals, errors, total):
-        OperationCompleted.__init__(self, total, "Recipe parsing Completed")
-        self.cached = cached
-        self.parsed = parsed
-        self.skipped = skipped
-        self.virtuals = virtuals
-        self.masked = masked
-        self.errors = errors
-        self.sofar = cached + parsed
-
-class ParseProgress(OperationProgress):
-    """Recipe parsing progress"""
-    def __init__(self, current, total):
-        OperationProgress.__init__(self, current, total, "Recipe parsing")
-
-
-class CacheLoadStarted(OperationStarted):
-    """Loading of the dependency cache has begun"""
-    def __init__(self, total):
-        OperationStarted.__init__(self, "Loading cache Started")
-        self.total = total
-
-class CacheLoadProgress(OperationProgress):
-    """Cache loading progress"""
-    def __init__(self, current, total):
-        OperationProgress.__init__(self, current, total, "Loading cache")
-
-class CacheLoadCompleted(OperationCompleted):
-    """Cache loading is complete"""
-    def __init__(self, total, num_entries):
-        OperationCompleted.__init__(self, total, "Loading cache Completed")
-        self.num_entries = num_entries
-
-class TreeDataPreparationStarted(OperationStarted):
-    """Tree data preparation started"""
-    def __init__(self):
-        OperationStarted.__init__(self, "Preparing tree data Started")
-
-class TreeDataPreparationProgress(OperationProgress):
-    """Tree data preparation is in progress"""
-    def __init__(self, current, total):
-        OperationProgress.__init__(self, current, total, "Preparing tree data")
-
-class TreeDataPreparationCompleted(OperationCompleted):
-    """Tree data preparation completed"""
-    def __init__(self, total):
-        OperationCompleted.__init__(self, total, "Preparing tree data Completed")
-
-class DepTreeGenerated(Event):
-    """
-    Event when a dependency tree has been generated
-    """
-
-    def __init__(self, depgraph):
-        Event.__init__(self)
-        self._depgraph = depgraph
-
-class TargetsTreeGenerated(Event):
-    """
-    Event when a set of buildable targets has been generated
-    """
-    def __init__(self, model):
-        Event.__init__(self)
-        self._model = model
-
-class FilesMatchingFound(Event):
-    """
-    Event when a list of files matching the supplied pattern has
-    been generated
-    """
-    def __init__(self, pattern, matches):
-        Event.__init__(self)
-        self._pattern = pattern
-        self._matches = matches
-
-class CoreBaseFilesFound(Event):
-    """
-    Event when a list of appropriate config files has been generated
-    """
-    def __init__(self, paths):
-        Event.__init__(self)
-        self._paths = paths
-
-class ConfigFilesFound(Event):
-    """
-    Event when a list of appropriate config files has been generated
-    """
-    def __init__(self, variable, values):
-        Event.__init__(self)
-        self._variable = variable
-        self._values = values
-
-class ConfigFilePathFound(Event):
-    """
-    Event when a path for a config file has been found
-    """
-    def __init__(self, path):
-        Event.__init__(self)
-        self._path = path
-
-class MsgBase(Event):
-    """Base class for messages"""
-
-    def __init__(self, msg):
-        self._message = msg
-        Event.__init__(self)
-
-class MsgDebug(MsgBase):
-    """Debug Message"""
-
-class MsgNote(MsgBase):
-    """Note Message"""
-
-class MsgWarn(MsgBase):
-    """Warning Message"""
-
-class MsgError(MsgBase):
-    """Error Message"""
-
-class MsgFatal(MsgBase):
-    """Fatal Message"""
-
-class MsgPlain(MsgBase):
-    """General output"""
-
-class LogExecTTY(Event):
-    """Send event containing program to spawn on tty of the logger"""
-    def __init__(self, msg, prog, sleep_delay, retries):
-        Event.__init__(self)
-        self.msg = msg
-        self.prog = prog
-        self.sleep_delay = sleep_delay
-        self.retries = retries
-
-class LogHandler(logging.Handler):
-    """Dispatch logging messages as bitbake events"""
-
-    def emit(self, record):
-        if record.exc_info:
-            etype, value, tb = record.exc_info
-            if hasattr(tb, 'tb_next'):
-                tb = list(bb.exceptions.extract_traceback(tb, context=3))
-            record.bb_exc_info = (etype, value, tb)
-            record.exc_info = None
-        fire(record, None)
-
-    def filter(self, record):
-        record.taskpid = worker_pid
-        return True
-
-class RequestPackageInfo(Event):
-    """
-    Event to request package information
-    """
-
-class PackageInfo(Event):
-    """
-    Package information for GUI
-    """
-    def __init__(self, pkginfolist):
-        Event.__init__(self)
-        self._pkginfolist = pkginfolist
-
-class MetadataEvent(Event):
-    """
-    Generic event that target for OE-Core classes
-    to report information during asynchrous execution
-    """
-    def __init__(self, eventtype, eventdata):
-        Event.__init__(self)
-        self.type = eventtype
-        self.data = eventdata
-
-class SanityCheck(Event):
-    """
-    Event to issue sanity check
-    """
-
-class SanityCheckPassed(Event):
-    """
-    Event to indicate sanity check is passed
-    """
-
-class SanityCheckFailed(Event):
-    """
-    Event to indicate sanity check has failed
-    """
-    def __init__(self, msg, network_error=False):
-        Event.__init__(self)
-        self._msg = msg
-        self._network_error = network_error
-
-class NetworkTest(Event):
-    """
-    Event to start network test
-    """
-
-class NetworkTestPassed(Event):
-    """
-    Event to indicate network test has passed
-    """
-
-class NetworkTestFailed(Event):
-    """
-    Event to indicate network test has failed
-    """
-

bitbake/lib/bb/exceptions.py

@@ -1,91 +0,0 @@
-from __future__ import absolute_import
-import inspect
-import traceback
-import bb.namedtuple_with_abc
-from collections import namedtuple
-
-
-class TracebackEntry(namedtuple.abc):
-    """Pickleable representation of a traceback entry"""
-    _fields = 'filename lineno function args code_context index'
-    _header = '  File "{0.filename}", line {0.lineno}, in {0.function}{0.args}'
-
-    def format(self, formatter=None):
-        if not self.code_context:
-            return self._header.format(self) + '\n'
-
-        formatted = [self._header.format(self) + ':\n']
-
-        for lineindex, line in enumerate(self.code_context):
-            if formatter:
-                line = formatter(line)
-
-            if lineindex == self.index:
-                formatted.append('    >%s' % line)
-            else:
-                formatted.append('     %s' % line)
-        return formatted
-
-    def __str__(self):
-        return ''.join(self.format())
-
-def _get_frame_args(frame):
-    """Get the formatted arguments and class (if available) for a frame"""
-    arginfo = inspect.getargvalues(frame)
-
-    try:
-        if not arginfo.args:
-            return '', None
-    # There have been reports from the field of python 2.6 which doesn't 
-    # return a namedtuple here but simply a tuple so fallback gracefully if
-    # args isn't present.
-    except AttributeError:
-        return '', None
-
-    firstarg = arginfo.args[0]
-    if firstarg == 'self':
-        self = arginfo.locals['self']
-        cls = self.__class__.__name__
-
-        arginfo.args.pop(0)
-        del arginfo.locals['self']
-    else:
-        cls = None
-
-    formatted = inspect.formatargvalues(*arginfo)
-    return formatted, cls
-
-def extract_traceback(tb, context=1):
-    frames = inspect.getinnerframes(tb, context)
-    for frame, filename, lineno, function, code_context, index in frames:
-        formatted_args, cls = _get_frame_args(frame)
-        if cls:
-            function = '%s.%s' % (cls, function)
-        yield TracebackEntry(filename, lineno, function, formatted_args,
-                             code_context, index)
-
-def format_extracted(extracted, formatter=None, limit=None):
-    if limit:
-        extracted = extracted[-limit:]
-
-    formatted = []
-    for tracebackinfo in extracted:
-        formatted.extend(tracebackinfo.format(formatter))
-    return formatted
-
-
-def format_exception(etype, value, tb, context=1, limit=None, formatter=None):
-    formatted = ['Traceback (most recent call last):\n']
-
-    if hasattr(tb, 'tb_next'):
-        tb = extract_traceback(tb, context)
-
-    formatted.extend(format_extracted(tb, formatter, limit))
-    formatted.extend(traceback.format_exception_only(etype, value))
-    return formatted
-
-def to_string(exc):
-    if isinstance(exc, SystemExit):
-        if not isinstance(exc.code, basestring):
-            return 'Exited with "%d"' % exc.code
-    return str(exc)

bitbake/lib/bb/fetch/__init__.py

@@ -0,0 +1,561 @@
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+"""
+BitBake 'Fetch' implementations
+
+Classes for obtaining upstream sources for the
+BitBake build tools.
+"""
+
+# Copyright (C) 2003, 2004  Chris Larson
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Based on functions from the base bb module, Copyright 2003 Holger Schurig
+
+import os, re, fcntl
+import bb
+from   bb import data
+from   bb import persist_data
+
+try:
+    import cPickle as pickle
+except ImportError:
+    import pickle
+
+class FetchError(Exception):
+    """Exception raised when a download fails"""
+
+class NoMethodError(Exception):
+    """Exception raised when there is no method to obtain a supplied url or set of urls"""
+
+class MissingParameterError(Exception):
+    """Exception raised when a fetch method is missing a critical parameter in the url"""
+
+class ParameterError(Exception):
+    """Exception raised when a url cannot be proccessed due to invalid parameters."""
+
+class MD5SumError(Exception):
+    """Exception raised when a MD5SUM of a file does not match the expected one"""
+
+class InvalidSRCREV(Exception):
+    """Exception raised when an invalid SRCREV is encountered"""
+
+def uri_replace(uri, uri_find, uri_replace, d):
+#   bb.msg.note(1, bb.msg.domain.Fetcher, "uri_replace: operating on %s" % uri)
+    if not uri or not uri_find or not uri_replace:
+        bb.msg.debug(1, bb.msg.domain.Fetcher, "uri_replace: passed an undefined value, not replacing")
+    uri_decoded = list(bb.decodeurl(uri))
+    uri_find_decoded = list(bb.decodeurl(uri_find))
+    uri_replace_decoded = list(bb.decodeurl(uri_replace))
+    result_decoded = ['','','','','',{}]
+    for i in uri_find_decoded:
+        loc = uri_find_decoded.index(i)
+        result_decoded[loc] = uri_decoded[loc]
+        import types
+        if type(i) == types.StringType:
+            import re
+            if (re.match(i, uri_decoded[loc])):
+                result_decoded[loc] = re.sub(i, uri_replace_decoded[loc], uri_decoded[loc])
+                if uri_find_decoded.index(i) == 2:
+                    if d:
+                        localfn = bb.fetch.localpath(uri, d)
+                        if localfn:
+                            result_decoded[loc] = os.path.dirname(result_decoded[loc]) + "/" + os.path.basename(bb.fetch.localpath(uri, d))
+#                       bb.msg.note(1, bb.msg.domain.Fetcher, "uri_replace: matching %s against %s and replacing with %s" % (i, uri_decoded[loc], uri_replace_decoded[loc]))
+            else:
+#               bb.msg.note(1, bb.msg.domain.Fetcher, "uri_replace: no match")
+                return uri
+#           else:
+#               for j in i.keys():
+#                   FIXME: apply replacements against options
+    return bb.encodeurl(result_decoded)
+
+methods = []
+urldata_cache = {}
+
+def fetcher_init(d):
+    """
+    Called to initilize the fetchers once the configuration data is known
+    Calls before this must not hit the cache.
+    """
+    pd = persist_data.PersistData(d)
+    # When to drop SCM head revisions controled by user policy
+    srcrev_policy = bb.data.getVar('BB_SRCREV_POLICY', d, 1) or "clear"
+    if srcrev_policy == "cache":
+        bb.msg.debug(1, bb.msg.domain.Fetcher, "Keeping SRCREV cache due to cache policy of: %s" % srcrev_policy)
+    elif srcrev_policy == "clear":
+        bb.msg.debug(1, bb.msg.domain.Fetcher, "Clearing SRCREV cache due to cache policy of: %s" % srcrev_policy)
+        pd.delDomain("BB_URI_HEADREVS")
+    else:
+        bb.msg.fatal(bb.msg.domain.Fetcher, "Invalid SRCREV cache policy of: %s" % srcrev_policy)
+    # Make sure our domains exist
+    pd.addDomain("BB_URI_HEADREVS")
+    pd.addDomain("BB_URI_LOCALCOUNT")
+
+# Function call order is usually:
+#   1. init
+#   2. go
+#   3. localpaths
+# localpath can be called at any time
+
+def init(urls, d, setup = True):
+    urldata = {}
+    fn = bb.data.getVar('FILE', d, 1)
+    if fn in urldata_cache:
+        urldata = urldata_cache[fn]
+
+    for url in urls:
+        if url not in urldata:
+            urldata[url] = FetchData(url, d)
+
+    if setup:
+        for url in urldata:
+            if not urldata[url].setup:
+                urldata[url].setup_localpath(d) 
+
+    urldata_cache[fn] = urldata
+    return urldata
+
+def go(d):
+    """
+    Fetch all urls
+    init must have previously been called
+    """
+    urldata = init([], d, True)
+
+    for u in urldata:
+        ud = urldata[u]
+        m = ud.method
+        if ud.localfile:
+            if not m.forcefetch(u, ud, d) and os.path.exists(ud.md5):
+                # File already present along with md5 stamp file
+                # Touch md5 file to show activity
+                try:
+                    os.utime(ud.md5, None)
+                except:
+                    # Errors aren't fatal here
+                    pass
+                continue
+            lf = bb.utils.lockfile(ud.lockfile)
+            if not m.forcefetch(u, ud, d) and os.path.exists(ud.md5):
+                # If someone else fetched this before we got the lock, 
+                # notice and don't try again
+                try:
+                    os.utime(ud.md5, None)
+                except:
+                    # Errors aren't fatal here
+                    pass
+                bb.utils.unlockfile(lf)
+                continue
+        m.go(u, ud, d)
+        if ud.localfile:
+            if not m.forcefetch(u, ud, d):
+                Fetch.write_md5sum(u, ud, d)
+            bb.utils.unlockfile(lf)
+
+
+def checkstatus(d):
+    """
+    Check all urls exist upstream
+    init must have previously been called
+    """
+    urldata = init([], d, True)
+
+    for u in urldata:
+        ud = urldata[u]
+        m = ud.method
+        bb.msg.note(1, bb.msg.domain.Fetcher, "Testing URL %s" % u)
+        ret = m.checkstatus(u, ud, d)
+        if not ret:
+            bb.msg.fatal(bb.msg.domain.Fetcher, "URL %s doesn't work" % u)
+
+def localpaths(d):
+    """
+    Return a list of the local filenames, assuming successful fetch
+    """
+    local = []
+    urldata = init([], d, True)
+
+    for u in urldata:
+        ud = urldata[u]      
+        local.append(ud.localpath)
+
+    return local
+
+srcrev_internal_call = False
+
+def get_srcrev(d):
+    """
+    Return the version string for the current package
+    (usually to be used as PV)
+    Most packages usually only have one SCM so we just pass on the call.
+    In the multi SCM case, we build a value based on SRCREV_FORMAT which must 
+    have been set.
+    """
+
+    #
+    # Ugly code alert. localpath in the fetchers will try to evaluate SRCREV which 
+    # could translate into a call to here. If it does, we need to catch this
+    # and provide some way so it knows get_srcrev is active instead of being
+    # some number etc. hence the srcrev_internal_call tracking and the magic  
+    # "SRCREVINACTION" return value.
+    #
+    # Neater solutions welcome!
+    #
+    if bb.fetch.srcrev_internal_call:
+        return "SRCREVINACTION"
+
+    scms = []
+
+    # Only call setup_localpath on URIs which suppports_srcrev() 
+    urldata = init(bb.data.getVar('SRC_URI', d, 1).split(), d, False)
+    for u in urldata:
+        ud = urldata[u]
+        if ud.method.suppports_srcrev():
+            if not ud.setup:
+                ud.setup_localpath(d)
+            scms.append(u)
+
+    if len(scms) == 0:
+        bb.msg.error(bb.msg.domain.Fetcher, "SRCREV was used yet no valid SCM was found in SRC_URI")
+        raise ParameterError
+
+    if len(scms) == 1:
+        return urldata[scms[0]].method.sortable_revision(scms[0], urldata[scms[0]], d)
+
+    #
+    # Mutiple SCMs are in SRC_URI so we resort to SRCREV_FORMAT
+    #
+    format = bb.data.getVar('SRCREV_FORMAT', d, 1)
+    if not format:
+        bb.msg.error(bb.msg.domain.Fetcher, "The SRCREV_FORMAT variable must be set when multiple SCMs are used.")
+        raise ParameterError
+
+    for scm in scms:
+        if 'name' in urldata[scm].parm:
+            name = urldata[scm].parm["name"]
+            rev = urldata[scm].method.sortable_revision(scm, urldata[scm], d)
+            format = format.replace(name, rev)
+
+    return format
+
+def localpath(url, d, cache = True):
+    """
+    Called from the parser with cache=False since the cache isn't ready 
+    at this point. Also called from classed in OE e.g. patch.bbclass
+    """
+    ud = init([url], d)
+    if ud[url].method:
+        return ud[url].localpath
+    return url
+
+def runfetchcmd(cmd, d, quiet = False):
+    """
+    Run cmd returning the command output
+    Raise an error if interrupted or cmd fails
+    Optionally echo command output to stdout
+    """
+
+    # Need to export PATH as binary could be in metadata paths
+    # rather than host provided
+    # Also include some other variables.
+    # FIXME: Should really include all export varaiables?
+    exportvars = ['PATH', 'GIT_PROXY_HOST', 'GIT_PROXY_PORT', 'GIT_PROXY_COMMAND']
+
+    for var in exportvars:
+        val = data.getVar(var, d, True)
+        if val:
+            cmd = 'export ' + var + '=%s; %s' % (val, cmd)
+
+    bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % cmd)
+
+    # redirect stderr to stdout
+    stdout_handle = os.popen(cmd + " 2>&1", "r")
+    output = ""
+
+    while 1:
+        line = stdout_handle.readline()
+        if not line:
+            break
+        if not quiet:
+            print line,
+        output += line
+
+    status =  stdout_handle.close() or 0
+    signal = status >> 8
+    exitstatus = status & 0xff
+
+    if signal:
+        raise FetchError("Fetch command %s failed with signal %s, output:\n%s" % (cmd, signal, output))
+    elif status != 0:
+        raise FetchError("Fetch command %s failed with exit code %s, output:\n%s" % (cmd, status, output))
+
+    return output
+
+class FetchData(object):
+    """
+    A class which represents the fetcher state for a given URI.
+    """
+    def __init__(self, url, d):
+        self.localfile = ""
+        (self.type, self.host, self.path, self.user, self.pswd, self.parm) = bb.decodeurl(data.expand(url, d))
+        self.date = Fetch.getSRCDate(self, d)
+        self.url = url
+        self.setup = False
+        for m in methods:
+            if m.supports(url, self, d):
+                self.method = m
+                return
+        raise NoMethodError("Missing implementation for url %s" % url)
+
+    def setup_localpath(self, d):
+        self.setup = True
+        if "localpath" in self.parm:
+            # if user sets localpath for file, use it instead.
+            self.localpath = self.parm["localpath"]
+        else:
+            bb.fetch.srcrev_internal_call = True
+            self.localpath = self.method.localpath(self.url, self, d)
+            bb.fetch.srcrev_internal_call = False
+            # We have to clear data's internal caches since the cached value of SRCREV is now wrong.
+            # Horrible...
+            bb.data.delVar("ISHOULDNEVEREXIST", d)
+        self.md5 = self.localpath + '.md5'
+        self.lockfile = self.localpath + '.lock'
+
+
+class Fetch(object):
+    """Base class for 'fetch'ing data"""
+
+    def __init__(self, urls = []):
+        self.urls = []
+
+    def supports(self, url, urldata, d):
+        """
+        Check to see if this fetch class supports a given url.
+        """
+        return 0
+
+    def localpath(self, url, urldata, d):
+        """
+        Return the local filename of a given url assuming a successful fetch.
+        Can also setup variables in urldata for use in go (saving code duplication 
+        and duplicate code execution)
+        """
+        return url
+
+    def setUrls(self, urls):
+        self.__urls = urls
+
+    def getUrls(self):
+        return self.__urls
+
+    urls = property(getUrls, setUrls, None, "Urls property")
+
+    def forcefetch(self, url, urldata, d):
+        """
+        Force a fetch, even if localpath exists?
+        """
+        return False
+
+    def suppports_srcrev(self):
+        """
+        The fetcher supports auto source revisions (SRCREV)
+        """
+        return False
+
+    def go(self, url, urldata, d):
+        """
+        Fetch urls
+        Assumes localpath was called first
+        """
+        raise NoMethodError("Missing implementation for url")
+
+    def checkstatus(self, url, urldata, d):
+        """
+        Check the status of a URL
+        Assumes localpath was called first
+        """
+        bb.msg.note(1, bb.msg.domain.Fetcher, "URL %s could not be checked for status since no method exists." % url)
+        return True
+
+    def getSRCDate(urldata, d):
+        """
+        Return the SRC Date for the component
+
+        d the bb.data module
+        """
+        if "srcdate" in urldata.parm:
+            return urldata.parm['srcdate']
+
+        pn = data.getVar("PN", d, 1)
+
+        if pn:
+            return data.getVar("SRCDATE_%s" % pn, d, 1) or data.getVar("CVSDATE_%s" % pn, d, 1) or data.getVar("SRCDATE", d, 1) or data.getVar("CVSDATE", d, 1) or data.getVar("DATE", d, 1)
+
+        return data.getVar("SRCDATE", d, 1) or data.getVar("CVSDATE", d, 1) or data.getVar("DATE", d, 1)
+    getSRCDate = staticmethod(getSRCDate)
+
+    def srcrev_internal_helper(ud, d):
+        """
+        Return:
+            a) a source revision if specified
+	    b) True if auto srcrev is in action
+	    c) False otherwise
+        """
+
+        if 'rev' in ud.parm:
+            return ud.parm['rev']
+
+        if 'tag' in ud.parm:
+            return ud.parm['tag']
+
+        rev = None
+        if 'name' in ud.parm:
+            pn = data.getVar("PN", d, 1)
+            rev = data.getVar("SRCREV_pn-" + pn + "_" + ud.parm['name'], d, 1)
+        if not rev:
+            rev = data.getVar("SRCREV", d, 1)
+        if rev == "INVALID":
+            raise InvalidSRCREV("Please set SRCREV to a valid value")
+        if not rev:
+            return False
+        if rev is "SRCREVINACTION":
+            return True
+        return rev
+
+    srcrev_internal_helper = staticmethod(srcrev_internal_helper)
+
+    def try_mirror(d, tarfn):
+        """
+        Try to use a mirrored version of the sources. We do this
+        to avoid massive loads on foreign cvs and svn servers.
+        This method will be used by the different fetcher
+        implementations.
+
+        d Is a bb.data instance
+        tarfn is the name of the tarball
+        """
+        tarpath = os.path.join(data.getVar("DL_DIR", d, 1), tarfn)
+        if os.access(tarpath, os.R_OK):
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists, skipping checkout." % tarfn)
+            return True
+
+        pn = data.getVar('PN', d, True)
+        src_tarball_stash = None
+        if pn:
+            src_tarball_stash = (data.getVar('SRC_TARBALL_STASH_%s' % pn, d, True) or data.getVar('CVS_TARBALL_STASH_%s' % pn, d, True) or data.getVar('SRC_TARBALL_STASH', d, True) or data.getVar('CVS_TARBALL_STASH', d, True) or "").split()
+
+        for stash in src_tarball_stash:
+            fetchcmd = data.getVar("FETCHCOMMAND_mirror", d, True) or data.getVar("FETCHCOMMAND_wget", d, True)
+            uri = stash + tarfn
+            bb.msg.note(1, bb.msg.domain.Fetcher, "fetch " + uri)
+            fetchcmd = fetchcmd.replace("${URI}", uri)
+            ret = os.system(fetchcmd)
+            if ret == 0:
+                bb.msg.note(1, bb.msg.domain.Fetcher, "Fetched %s from tarball stash, skipping checkout" % tarfn)
+                return True
+        return False
+    try_mirror = staticmethod(try_mirror)
+
+    def verify_md5sum(ud, got_sum):
+        """
+        Verify the md5sum we wanted with the one we got
+        """
+        wanted_sum = None
+        if 'md5sum' in ud.parm:
+            wanted_sum = ud.parm['md5sum']
+        if not wanted_sum:
+            return True
+
+        return wanted_sum == got_sum
+    verify_md5sum = staticmethod(verify_md5sum)
+
+    def write_md5sum(url, ud, d):
+        md5data = bb.utils.md5_file(ud.localpath)
+        # verify the md5sum
+        if not Fetch.verify_md5sum(ud, md5data):
+            raise MD5SumError(url)
+
+        md5out = file(ud.md5, 'w')
+        md5out.write(md5data)
+        md5out.close()
+    write_md5sum = staticmethod(write_md5sum)
+
+    def latest_revision(self, url, ud, d):
+        """
+        Look in the cache for the latest revision, if not present ask the SCM.
+        """
+        if not hasattr(self, "_latest_revision"):
+            raise ParameterError
+
+        pd = persist_data.PersistData(d)
+        key = self._revision_key(url, ud, d)
+        rev = pd.getValue("BB_URI_HEADREVS", key)
+        if rev != None:
+            return str(rev)
+
+        rev = self._latest_revision(url, ud, d)
+        pd.setValue("BB_URI_HEADREVS", key, rev)
+        return rev
+
+    def sortable_revision(self, url, ud, d):
+        """
+        
+        """
+        if hasattr(self, "_sortable_revision"):
+            return self._sortable_revision(url, ud, d)
+
+        pd = persist_data.PersistData(d)
+        key = self._revision_key(url, ud, d)
+        latest_rev = self._build_revision(url, ud, d)
+        last_rev = pd.getValue("BB_URI_LOCALCOUNT", key + "_rev")
+        count = pd.getValue("BB_URI_LOCALCOUNT", key + "_count")
+
+        if last_rev == latest_rev:
+            return str(count + "+" + latest_rev)
+
+        if count is None:
+            count = "0"
+        else:
+            count = str(int(count) + 1)
+
+        pd.setValue("BB_URI_LOCALCOUNT", key + "_rev", latest_rev)
+        pd.setValue("BB_URI_LOCALCOUNT", key + "_count", count)
+
+        return str(count + "+" + latest_rev)
+
+
+import cvs
+import git
+import local
+import svn
+import wget
+import svk
+import ssh
+import perforce
+import bzr
+import hg
+
+methods.append(local.Local())
+methods.append(wget.Wget())
+methods.append(svn.Svn())
+methods.append(git.Git())
+methods.append(cvs.Cvs())
+methods.append(svk.Svk())
+methods.append(ssh.SSH())
+methods.append(perforce.Perforce())
+methods.append(bzr.Bzr())
+methods.append(hg.Hg())

bitbake/lib/bb/fetch/bzr.py

@@ -0,0 +1,154 @@
+"""
+BitBake 'Fetch' implementation for bzr.
+
+"""
+
+# Copyright (C) 2007 Ross Burton
+# Copyright (C) 2007 Richard Purdie
+#
+#   Classes for obtaining upstream sources for the
+#   BitBake build tools.
+#   Copyright (C) 2003, 2004  Chris Larson
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import os
+import sys
+import bb
+from bb import data
+from bb.fetch import Fetch
+from bb.fetch import FetchError
+from bb.fetch import MissingParameterError
+from bb.fetch import runfetchcmd
+
+class Bzr(Fetch):
+    def supports(self, url, ud, d):
+        return ud.type in ['bzr']
+
+    def localpath (self, url, ud, d):
+
+        # Create paths to bzr checkouts
+        relpath = ud.path
+        if relpath.startswith('/'):
+            # Remove leading slash as os.path.join can't cope
+            relpath = relpath[1:]
+        ud.pkgdir = os.path.join(data.expand('${BZRDIR}', d), ud.host, relpath)
+
+        revision = Fetch.srcrev_internal_helper(ud, d)
+        if revision is True:
+            ud.revision = self.latest_revision(url, ud, d)	
+        elif revision:
+            ud.revision = revision
+
+        if not ud.revision:
+            ud.revision = self.latest_revision(url, ud, d)	
+
+        ud.localfile = data.expand('bzr_%s_%s_%s.tar.gz' % (ud.host, ud.path.replace('/', '.'), ud.revision), d)
+        
+        return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile)
+
+    def _buildbzrcommand(self, ud, d, command):
+        """
+        Build up an bzr commandline based on ud
+        command is "fetch", "update", "revno"
+        """
+
+        basecmd = data.expand('${FETCHCMD_bzr}', d)
+
+        proto = "http"
+        if "proto" in ud.parm:
+            proto = ud.parm["proto"]
+
+        bzrroot = ud.host + ud.path
+
+        options = []
+
+        if command is "revno":
+            bzrcmd = "%s revno %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot)
+        else:
+            if ud.revision:
+                options.append("-r %s" % ud.revision)
+
+            if command is "fetch":
+                bzrcmd = "%s co %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot)
+            elif command is "update":
+                bzrcmd = "%s pull %s --overwrite" % (basecmd, " ".join(options))
+            else:
+                raise FetchError("Invalid bzr command %s" % command)
+
+        return bzrcmd
+
+    def go(self, loc, ud, d):
+        """Fetch url"""
+
+        # try to use the tarball stash
+        if Fetch.try_mirror(d, ud.localfile):
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists or was mirrored, skipping bzr checkout." % ud.localpath)
+            return
+
+        if os.access(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir), '.bzr'), os.R_OK):
+            bzrcmd = self._buildbzrcommand(ud, d, "update")
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "BZR Update %s" % loc)
+            os.chdir(os.path.join (ud.pkgdir, os.path.basename(ud.path)))
+            runfetchcmd(bzrcmd, d)
+        else:
+            os.system("rm -rf %s" % os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir)))
+            bzrcmd = self._buildbzrcommand(ud, d, "fetch")
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "BZR Checkout %s" % loc)
+            bb.mkdirhier(ud.pkgdir)
+            os.chdir(ud.pkgdir)
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % bzrcmd)
+            runfetchcmd(bzrcmd, d)
+
+        os.chdir(ud.pkgdir)
+        # tar them up to a defined filename
+        try:
+            runfetchcmd("tar -czf %s %s" % (ud.localpath, os.path.basename(ud.pkgdir)), d)
+        except:
+            t, v, tb = sys.exc_info()
+            try:
+                os.unlink(ud.localpath)
+            except OSError:
+                pass
+            raise t, v, tb
+
+    def suppports_srcrev(self):
+        return True
+
+    def _revision_key(self, url, ud, d):
+        """
+        Return a unique key for the url
+        """
+        return "bzr:" + ud.pkgdir
+
+    def _latest_revision(self, url, ud, d):
+        """
+        Return the latest upstream revision number
+        """
+        bb.msg.debug(2, bb.msg.domain.Fetcher, "BZR fetcher hitting network for %s" % url)
+
+        output = runfetchcmd(self._buildbzrcommand(ud, d, "revno"), d, True)
+
+        return output.strip()
+
+    def _sortable_revision(self, url, ud, d):
+        """
+        Return a sortable revision number which in our case is the revision number
+        """
+
+        return self._build_revision(url, ud, d)
+
+    def _build_revision(self, url, ud, d):
+        return ud.revision
+

bitbake/lib/bb/fetch/cvs.py

@@ -0,0 +1,178 @@
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+"""
+BitBake 'Fetch' implementations
+
+Classes for obtaining upstream sources for the
+BitBake build tools.
+
+"""
+
+# Copyright (C) 2003, 2004  Chris Larson
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#Based on functions from the base bb module, Copyright 2003 Holger Schurig
+#
+
+import os, re
+import bb
+from   bb import data
+from   bb.fetch import Fetch
+from   bb.fetch import FetchError
+from   bb.fetch import MissingParameterError
+
+class Cvs(Fetch):
+    """
+    Class to fetch a module or modules from cvs repositories
+    """
+    def supports(self, url, ud, d):
+        """
+        Check to see if a given url can be fetched with cvs.
+        """
+        return ud.type in ['cvs', 'pserver']
+
+    def localpath(self, url, ud, d):
+        if not "module" in ud.parm:
+            raise MissingParameterError("cvs method needs a 'module' parameter")
+        ud.module = ud.parm["module"]
+
+        ud.tag = ""
+        if 'tag' in ud.parm:
+            ud.tag = ud.parm['tag']
+
+        # Override the default date in certain cases
+        if 'date' in ud.parm:
+            ud.date = ud.parm['date']
+        elif ud.tag:
+            ud.date = ""
+
+        norecurse = ''
+        if 'norecurse' in ud.parm:
+            norecurse = '_norecurse'
+
+        fullpath = ''
+        if 'fullpath' in ud.parm:
+            fullpath = '_fullpath'
+
+        ud.localfile = data.expand('%s_%s_%s_%s%s%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.tag, ud.date, norecurse, fullpath), d)
+
+        return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile)
+
+    def forcefetch(self, url, ud, d):
+        if (ud.date == "now"):
+            return True
+        return False
+
+    def go(self, loc, ud, d):
+
+        # try to use the tarball stash
+        if not self.forcefetch(loc, ud, d) and Fetch.try_mirror(d, ud.localfile):
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists or was mirrored, skipping cvs checkout." % ud.localpath)
+            return
+
+        method = "pserver"
+        if "method" in ud.parm:
+            method = ud.parm["method"]
+
+        localdir = ud.module
+        if "localdir" in ud.parm:
+            localdir = ud.parm["localdir"]
+
+        cvs_port = ""
+        if "port" in ud.parm:
+            cvs_port = ud.parm["port"]
+
+        cvs_rsh = None
+        if method == "ext":
+            if "rsh" in ud.parm:
+                cvs_rsh = ud.parm["rsh"]
+
+        if method == "dir":
+            cvsroot = ud.path
+        else:
+            cvsroot = ":" + method
+            cvsproxyhost = data.getVar('CVS_PROXY_HOST', d, True)
+            if cvsproxyhost:
+                cvsroot += ";proxy=" + cvsproxyhost
+            cvsproxyport = data.getVar('CVS_PROXY_PORT', d, True)
+            if cvsproxyport:
+                cvsroot += ";proxyport=" + cvsproxyport
+            cvsroot += ":" + ud.user
+            if ud.pswd:
+                cvsroot += ":" + ud.pswd
+            cvsroot += "@" + ud.host + ":" + cvs_port + ud.path
+
+        options = []
+        if 'norecurse' in ud.parm:
+            options.append("-l")
+        if ud.date:
+            options.append("-D \"%s UTC\"" % ud.date)
+        if ud.tag:
+            options.append("-r %s" % ud.tag)
+
+        localdata = data.createCopy(d)
+        data.setVar('OVERRIDES', "cvs:%s" % data.getVar('OVERRIDES', localdata), localdata)
+        data.update_data(localdata)
+
+        data.setVar('CVSROOT', cvsroot, localdata)
+        data.setVar('CVSCOOPTS', " ".join(options), localdata)
+        data.setVar('CVSMODULE', ud.module, localdata)
+        cvscmd = data.getVar('FETCHCOMMAND', localdata, 1)
+        cvsupdatecmd = data.getVar('UPDATECOMMAND', localdata, 1)
+
+        if cvs_rsh:
+            cvscmd = "CVS_RSH=\"%s\" %s" % (cvs_rsh, cvscmd)
+            cvsupdatecmd = "CVS_RSH=\"%s\" %s" % (cvs_rsh, cvsupdatecmd)
+
+        # create module directory
+        bb.msg.debug(2, bb.msg.domain.Fetcher, "Fetch: checking for module directory")
+        pkg = data.expand('${PN}', d)
+        pkgdir = os.path.join(data.expand('${CVSDIR}', localdata), pkg)
+        moddir = os.path.join(pkgdir,localdir)
+        if os.access(os.path.join(moddir,'CVS'), os.R_OK):
+            bb.msg.note(1, bb.msg.domain.Fetcher, "Update " + loc)
+            # update sources there
+            os.chdir(moddir)
+            myret = os.system(cvsupdatecmd)
+        else:
+            bb.msg.note(1, bb.msg.domain.Fetcher, "Fetch " + loc)
+            # check out sources there
+            bb.mkdirhier(pkgdir)
+            os.chdir(pkgdir)
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % cvscmd)
+            myret = os.system(cvscmd)
+
+        if myret != 0 or not os.access(moddir, os.R_OK):
+            try:
+                os.rmdir(moddir)
+            except OSError:
+                 pass
+            raise FetchError(ud.module)
+
+        # tar them up to a defined filename
+        if 'fullpath' in ud.parm:
+            os.chdir(pkgdir)
+            myret = os.system("tar -czf %s %s" % (ud.localpath, localdir))
+        else:
+            os.chdir(moddir)
+            os.chdir('..')
+            myret = os.system("tar -czf %s %s" % (ud.localpath, os.path.basename(moddir)))
+
+        if myret != 0:
+            try:
+                os.unlink(ud.localpath)
+            except OSError:
+                pass
+            raise FetchError(ud.module)

bitbake/lib/bb/fetch/git.py

@@ -0,0 +1,133 @@
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+"""
+BitBake 'Fetch' git implementation
+
+"""
+
+#Copyright (C) 2005 Richard Purdie
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import os, re
+import bb
+from   bb    import data
+from   bb.fetch import Fetch
+from   bb.fetch import FetchError
+from   bb.fetch import runfetchcmd
+
+class Git(Fetch):
+    """Class to fetch a module or modules from git repositories"""
+    def supports(self, url, ud, d):
+        """
+        Check to see if a given url can be fetched with git.
+        """
+        return ud.type in ['git']
+
+    def localpath(self, url, ud, d):
+
+        ud.proto = "rsync"
+        if 'protocol' in ud.parm:
+            ud.proto = ud.parm['protocol']
+
+        ud.branch = ud.parm.get("branch", "master")
+
+        tag = Fetch.srcrev_internal_helper(ud, d)
+        if tag is True:
+            ud.tag = self.latest_revision(url, ud, d)	
+        elif tag:
+            ud.tag = tag
+
+        if not ud.tag:
+            ud.tag = self.latest_revision(url, ud, d)	
+
+        if ud.tag == "master":
+            ud.tag = self.latest_revision(url, ud, d)
+
+        ud.localfile = data.expand('git_%s%s_%s.tar.gz' % (ud.host, ud.path.replace('/', '.'), ud.tag), d)
+
+        return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile)
+
+    def go(self, loc, ud, d):
+        """Fetch url"""
+
+        if Fetch.try_mirror(d, ud.localfile):
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists (or was stashed). Skipping git checkout." % ud.localpath)
+            return
+
+        gitsrcname = '%s%s' % (ud.host, ud.path.replace('/', '.'))
+
+        repofilename = 'git_%s.tar.gz' % (gitsrcname)
+        repofile = os.path.join(data.getVar("DL_DIR", d, 1), repofilename)
+        repodir = os.path.join(data.expand('${GITDIR}', d), gitsrcname)
+
+        coname = '%s' % (ud.tag)
+        codir = os.path.join(repodir, coname)
+
+        if not os.path.exists(repodir):
+            if Fetch.try_mirror(d, repofilename):    
+                bb.mkdirhier(repodir)
+                os.chdir(repodir)
+                runfetchcmd("tar -xzf %s" % (repofile), d)
+            else:
+                runfetchcmd("git clone -n %s://%s%s %s" % (ud.proto, ud.host, ud.path, repodir), d)
+
+        os.chdir(repodir)
+        # Remove all but the .git directory
+        runfetchcmd("rm * -Rf", d)
+        runfetchcmd("git fetch %s://%s%s %s" % (ud.proto, ud.host, ud.path, ud.branch), d)
+        runfetchcmd("git fetch --tags %s://%s%s" % (ud.proto, ud.host, ud.path), d)
+        runfetchcmd("git prune-packed", d)
+        runfetchcmd("git pack-redundant --all | xargs -r rm", d)
+
+        os.chdir(repodir)
+        mirror_tarballs = data.getVar("BB_GENERATE_MIRROR_TARBALLS", d, True)
+        if mirror_tarballs != "0": 
+            bb.msg.note(1, bb.msg.domain.Fetcher, "Creating tarball of git repository")
+            runfetchcmd("tar -czf %s %s" % (repofile, os.path.join(".", ".git", "*") ), d)
+
+        if os.path.exists(codir):
+            bb.utils.prunedir(codir)
+
+        bb.mkdirhier(codir)
+        os.chdir(repodir)
+        runfetchcmd("git read-tree %s" % (ud.tag), d)
+        runfetchcmd("git checkout-index -q -f --prefix=%s -a" % (os.path.join(codir, "git", "")), d)
+
+        os.chdir(codir)
+        bb.msg.note(1, bb.msg.domain.Fetcher, "Creating tarball of git checkout")
+        runfetchcmd("tar -czf %s %s" % (ud.localpath, os.path.join(".", "*") ), d)
+
+        os.chdir(repodir)
+        bb.utils.prunedir(codir)
+
+    def suppports_srcrev(self):
+        return True
+
+    def _revision_key(self, url, ud, d):
+        """
+        Return a unique key for the url
+        """
+        return "git:" + ud.host + ud.path.replace('/', '.')
+
+    def _latest_revision(self, url, ud, d):
+        """
+        Compute the HEAD revision for the url
+        """
+        output = runfetchcmd("git ls-remote %s://%s%s %s" % (ud.proto, ud.host, ud.path, ud.branch), d, True)
+        return output.split()[0]
+
+    def _build_revision(self, url, ud, d):
+        return ud.tag
+

bitbake/lib/bb/fetch/hg.py

@@ -0,0 +1,147 @@
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+"""
+BitBake 'Fetch' implementation for mercurial DRCS (hg).
+
+"""
+
+# Copyright (C) 2003, 2004  Chris Larson
+# Copyright (C) 2004        Marcin Juszkiewicz
+# Copyright (C) 2007        Robert Schuster
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Based on functions from the base bb module, Copyright 2003 Holger Schurig
+
+import os, re
+import sys
+import bb
+from bb import data
+from bb.fetch import Fetch
+from bb.fetch import FetchError
+from bb.fetch import MissingParameterError
+from bb.fetch import runfetchcmd
+
+class Hg(Fetch):
+    """Class to fetch a from mercurial repositories"""
+    def supports(self, url, ud, d):
+        """
+        Check to see if a given url can be fetched with mercurial.
+        """
+        return ud.type in ['hg']
+
+    def localpath(self, url, ud, d):
+        if not "module" in ud.parm:
+            raise MissingParameterError("hg method needs a 'module' parameter")
+
+        ud.module = ud.parm["module"]
+
+        # Create paths to mercurial checkouts
+        relpath = ud.path
+        if relpath.startswith('/'):
+            # Remove leading slash as os.path.join can't cope
+            relpath = relpath[1:]
+        ud.pkgdir = os.path.join(data.expand('${HGDIR}', d), ud.host, relpath)
+        ud.moddir = os.path.join(ud.pkgdir, ud.module)
+
+        if 'rev' in ud.parm:
+            ud.revision = ud.parm['rev']
+
+        ud.localfile = data.expand('%s_%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision), d)
+
+        return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile)
+
+    def _buildhgcommand(self, ud, d, command):
+        """
+        Build up an hg commandline based on ud
+        command is "fetch", "update", "info"
+        """
+
+        basecmd = data.expand('${FETCHCMD_hg}', d)
+
+        proto = "http"
+        if "proto" in ud.parm:
+            proto = ud.parm["proto"]
+
+        host = ud.host
+        if proto == "file":
+            host = "/"
+            ud.host = "localhost"
+
+        if ud.user == None:
+            hgroot = host + ud.path
+        else:
+            hgroot = ud.user + "@" + host + ud.path
+
+        if command is "info":
+            return "%s identify -i %s://%s/%s" % (basecmd, proto, hgroot, ud.module)
+
+        options = [];
+        if ud.revision:
+            options.append("-r %s" % ud.revision)
+
+        if command is "fetch":
+            cmd = "%s clone %s %s://%s/%s %s" % (basecmd, " ".join(options), proto, hgroot, ud.module, ud.module)
+        elif command is "pull":
+            # do not pass options list; limiting pull to rev causes the local
+            # repo not to contain it and immediately following "update" command
+            # will crash
+            cmd = "%s pull" % (basecmd)
+        elif command is "update":
+            cmd = "%s update -C %s" % (basecmd, " ".join(options))
+        else:
+            raise FetchError("Invalid hg command %s" % command)
+
+        return cmd
+
+    def go(self, loc, ud, d):
+        """Fetch url"""
+
+        # try to use the tarball stash
+        if Fetch.try_mirror(d, ud.localfile):
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists or was mirrored, skipping hg checkout." % ud.localpath)
+            return
+
+        bb.msg.debug(2, bb.msg.domain.Fetcher, "Fetch: checking for module directory '" + ud.moddir + "'")
+
+        if os.access(os.path.join(ud.moddir, '.hg'), os.R_OK):
+            updatecmd = self._buildhgcommand(ud, d, "pull")
+            bb.msg.note(1, bb.msg.domain.Fetcher, "Update " + loc)
+            # update sources there
+            os.chdir(ud.moddir)
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % updatecmd)
+            runfetchcmd(updatecmd, d)
+
+            updatecmd = self._buildhgcommand(ud, d, "update")
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % updatecmd)
+            runfetchcmd(updatecmd, d)
+        else:
+            fetchcmd = self._buildhgcommand(ud, d, "fetch")
+            bb.msg.note(1, bb.msg.domain.Fetcher, "Fetch " + loc)
+            # check out sources there
+            bb.mkdirhier(ud.pkgdir)
+            os.chdir(ud.pkgdir)
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % fetchcmd)
+            runfetchcmd(fetchcmd, d)
+
+        os.chdir(ud.pkgdir)
+        try:
+            runfetchcmd("tar -czf %s %s" % (ud.localpath, ud.module), d)
+        except:
+            t, v, tb = sys.exc_info()
+            try:
+                os.unlink(ud.localpath)
+            except OSError:
+                pass
+            raise t, v, tb

bitbake/lib/bb/fetch/local.py

@@ -0,0 +1,72 @@
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+"""
+BitBake 'Fetch' implementations
+
+Classes for obtaining upstream sources for the
+BitBake build tools.
+
+"""
+
+# Copyright (C) 2003, 2004  Chris Larson
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Based on functions from the base bb module, Copyright 2003 Holger Schurig
+
+import os, re
+import bb
+from   bb import data
+from   bb.fetch import Fetch
+
+class Local(Fetch):
+    def supports(self, url, urldata, d):
+        """
+        Check to see if a given url can be fetched with cvs.
+        """
+        return urldata.type in ['file','patch']
+
+    def localpath(self, url, urldata, d):
+        """
+        Return the local filename of a given url assuming a successful fetch.
+        """
+        path = url.split("://")[1]
+        path = path.split(";")[0]
+        newpath = path
+        if path[0] != "/":
+            filespath = data.getVar('FILESPATH', d, 1)
+            if filespath:
+                newpath = bb.which(filespath, path)
+            if not newpath:
+                filesdir = data.getVar('FILESDIR', d, 1)
+                if filesdir:
+                    newpath = os.path.join(filesdir, path)
+        # We don't set localfile as for this fetcher the file is already local!
+        return newpath
+
+    def go(self, url, urldata, d):
+        """Fetch urls (no-op for Local method)"""
+        # no need to fetch local files, we'll deal with them in place.
+        return 1
+
+    def checkstatus(self, url, urldata, d):
+        """
+        Check the status of the url
+        """
+        if urldata.localpath.find("*") != -1:
+            bb.msg.note(1, bb.msg.domain.Fetcher, "URL %s looks like a glob and was therefore not checked." % url)	
+	    return True
+        if os.path.exists(urldata.localpath):
+           return True
+        return False

bitbake/lib/bb/fetch/perforce.py

@@ -0,0 +1,213 @@
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+"""
+BitBake 'Fetch' implementations
+
+Classes for obtaining upstream sources for the
+BitBake build tools.
+
+"""
+
+# Copyright (C) 2003, 2004  Chris Larson
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Based on functions from the base bb module, Copyright 2003 Holger Schurig
+
+import os, re
+import bb
+from   bb import data
+from   bb.fetch import Fetch
+from   bb.fetch import FetchError
+from   bb.fetch import MissingParameterError
+
+class Perforce(Fetch):
+    def supports(self, url, ud, d):
+        return ud.type in ['p4']
+
+    def doparse(url,d):
+        parm = {}
+        path = url.split("://")[1]
+        delim = path.find("@");
+        if delim != -1:
+            (user,pswd,host,port) = path.split('@')[0].split(":")
+            path = path.split('@')[1]
+        else:
+            (host,port) = data.getVar('P4PORT', d).split(':')
+            user = ""
+            pswd = ""
+
+        if path.find(";") != -1:
+            keys=[]
+            values=[]
+            plist = path.split(';')
+            for item in plist:
+                if item.count('='):
+                    (key,value) = item.split('=')
+                    keys.append(key)
+                    values.append(value)
+
+            parm = dict(zip(keys,values))
+        path = "//" + path.split(';')[0]
+        host += ":%s" % (port)
+        parm["cset"] = Perforce.getcset(d, path, host, user, pswd, parm)
+
+        return host,path,user,pswd,parm
+    doparse = staticmethod(doparse)
+
+    def getcset(d, depot,host,user,pswd,parm):
+        if "cset" in parm:
+            return parm["cset"];
+        if user:
+            data.setVar('P4USER', user, d)
+        if pswd:
+            data.setVar('P4PASSWD', pswd, d)
+        if host:
+            data.setVar('P4PORT', host, d)
+
+        p4date = data.getVar("P4DATE", d, 1)
+        if "revision" in parm:
+            depot += "#%s" % (parm["revision"])
+        elif "label" in parm:
+            depot += "@%s" % (parm["label"])
+        elif p4date:
+            depot += "@%s" % (p4date)
+
+        p4cmd = data.getVar('FETCHCOMMAND_p4', d, 1)
+        bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s changes -m 1 %s" % (p4cmd, depot))
+        p4file = os.popen("%s changes -m 1 %s" % (p4cmd,depot))
+        cset = p4file.readline().strip()
+        bb.msg.debug(1, bb.msg.domain.Fetcher, "READ %s" % (cset))
+        if not cset:
+            return -1
+
+        return cset.split(' ')[1]
+    getcset = staticmethod(getcset)
+
+    def localpath(self, url, ud, d):        
+
+        (host,path,user,pswd,parm) = Perforce.doparse(url,d)
+
+        # If a label is specified, we use that as our filename
+
+        if "label" in parm:
+            ud.localfile = "%s.tar.gz" % (parm["label"])
+            return os.path.join(data.getVar("DL_DIR", d, 1), ud.localfile)
+
+        base = path
+        which = path.find('/...')
+        if which != -1:
+            base = path[:which]
+
+        if base[0] == "/":
+            base = base[1:]
+
+        cset = Perforce.getcset(d, path, host, user, pswd, parm)
+
+        ud.localfile = data.expand('%s+%s+%s.tar.gz' % (host,base.replace('/', '.'), cset), d)
+
+        return os.path.join(data.getVar("DL_DIR", d, 1), ud.localfile)
+
+    def go(self, loc, ud, d):
+        """
+        Fetch urls
+        """
+
+        # try to use the tarball stash
+        if Fetch.try_mirror(d, ud.localfile):
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists or was mirrored, skipping perforce checkout." % ud.localpath)
+            return
+
+        (host,depot,user,pswd,parm) = Perforce.doparse(loc, d)
+
+        if depot.find('/...') != -1:
+            path = depot[:depot.find('/...')]
+        else:
+            path = depot
+
+        if "module" in parm:
+            module = parm["module"]
+        else:
+            module = os.path.basename(path)
+
+        localdata = data.createCopy(d)
+        data.setVar('OVERRIDES', "p4:%s" % data.getVar('OVERRIDES', localdata), localdata)
+        data.update_data(localdata)
+
+        # Get the p4 command
+        if user:
+            data.setVar('P4USER', user, localdata)
+
+        if pswd:
+            data.setVar('P4PASSWD', pswd, localdata)
+
+        if host:
+            data.setVar('P4PORT', host, localdata)
+
+        p4cmd = data.getVar('FETCHCOMMAND', localdata, 1)
+
+        # create temp directory
+        bb.msg.debug(2, bb.msg.domain.Fetcher, "Fetch: creating temporary directory")
+        bb.mkdirhier(data.expand('${WORKDIR}', localdata))
+        data.setVar('TMPBASE', data.expand('${WORKDIR}/oep4.XXXXXX', localdata), localdata)
+        tmppipe = os.popen(data.getVar('MKTEMPDIRCMD', localdata, 1) or "false")
+        tmpfile = tmppipe.readline().strip()
+        if not tmpfile:
+            bb.error("Fetch: unable to create temporary directory.. make sure 'mktemp' is in the PATH.")
+            raise FetchError(module)
+
+        if "label" in parm:
+            depot = "%s@%s" % (depot,parm["label"])
+        else:
+            cset = Perforce.getcset(d, depot, host, user, pswd, parm)
+            depot = "%s@%s" % (depot,cset)
+
+        os.chdir(tmpfile)
+        bb.msg.note(1, bb.msg.domain.Fetcher, "Fetch " + loc)
+        bb.msg.note(1, bb.msg.domain.Fetcher, "%s files %s" % (p4cmd, depot))
+        p4file = os.popen("%s files %s" % (p4cmd, depot))
+
+        if not p4file:
+            bb.error("Fetch: unable to get the P4 files from %s" % (depot))
+            raise FetchError(module)
+
+        count = 0
+
+        for file in p4file: 
+            list = file.split()
+
+            if list[2] == "delete":
+                continue
+
+            dest = list[0][len(path)+1:]
+            where = dest.find("#")
+
+            os.system("%s print -o %s/%s %s" % (p4cmd, module,dest[:where],list[0]))
+            count = count + 1
+            
+        if count == 0:
+            bb.error("Fetch:  No files gathered from the P4 fetch")
+            raise FetchError(module)
+
+        myret = os.system("tar -czf %s %s" % (ud.localpath, module))
+        if myret != 0:
+            try:
+                os.unlink(ud.localpath)
+            except OSError:
+                pass
+            raise FetchError(module)
+        # cleanup
+        os.system('rm -rf %s' % tmpfile)
+
+

bitbake/lib/bb/fetch/ssh.py

@@ -0,0 +1,120 @@
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+'''
+BitBake 'Fetch' implementations
+
+This implementation is for Secure Shell (SSH), and attempts to comply with the
+IETF secsh internet draft:
+    http://tools.ietf.org/wg/secsh/draft-ietf-secsh-scp-sftp-ssh-uri/
+
+    Currently does not support the sftp parameters, as this uses scp
+    Also does not support the 'fingerprint' connection parameter.
+
+'''
+
+# Copyright (C) 2006  OpenedHand Ltd.
+#
+#
+# Based in part on svk.py:
+#    Copyright (C) 2006 Holger Hans Peter Freyther
+#    Based on svn.py:
+#        Copyright (C) 2003, 2004  Chris Larson
+#        Based on functions from the base bb module:
+#            Copyright 2003 Holger Schurig
+#
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import re, os
+import bb
+from   bb import data
+from   bb.fetch import Fetch
+from   bb.fetch import FetchError
+from   bb.fetch import MissingParameterError
+
+
+__pattern__ = re.compile(r'''
+ \s*                 # Skip leading whitespace
+ ssh://              # scheme
+ (                   # Optional username/password block
+  (?P<user>\S+)      # username
+  (:(?P<pass>\S+))?  # colon followed by the password (optional)
+ )?
+ (?P<cparam>(;[^;]+)*)?  # connection parameters block (optional)
+ @
+ (?P<host>\S+?)          # non-greedy match of the host
+ (:(?P<port>[0-9]+))?    # colon followed by the port (optional)
+ /
+ (?P<path>[^;]+)         # path on the remote system, may be absolute or relative,
+                         # and may include the use of '~' to reference the remote home
+                         # directory
+ (?P<sparam>(;[^;]+)*)?  # parameters block (optional)
+ $
+''', re.VERBOSE)
+
+class SSH(Fetch):
+    '''Class to fetch a module or modules via Secure Shell'''
+
+    def supports(self, url, urldata, d):
+        return __pattern__.match(url) != None
+
+    def localpath(self, url, urldata, d):
+        m = __pattern__.match(url)
+        path = m.group('path')
+        host = m.group('host')
+        lpath = os.path.join(data.getVar('DL_DIR', d, True), host, os.path.basename(path))
+        return lpath
+
+    def go(self, url, urldata, d):
+        dldir = data.getVar('DL_DIR', d, 1)
+
+        m = __pattern__.match(url)
+        path = m.group('path')
+        host = m.group('host')
+        port = m.group('port')
+        user = m.group('user')
+        password = m.group('pass')
+
+        ldir = os.path.join(dldir, host)
+        lpath = os.path.join(ldir, os.path.basename(path))
+
+        if not os.path.exists(ldir):
+            os.makedirs(ldir)
+
+        if port:
+            port = '-P %s' % port
+        else:
+            port = ''
+
+        if user:
+            fr = user
+            if password:
+                fr += ':%s' % password
+            fr += '@%s' % host
+        else:
+            fr = host
+        fr += ':%s' % path
+
+
+        import commands
+        cmd = 'scp -B -r %s %s %s/' % (
+            port,
+            commands.mkarg(fr),
+            commands.mkarg(ldir)
+        )
+
+        (exitstatus, output) = commands.getstatusoutput(cmd)
+        if exitstatus != 0:
+            print output
+            raise FetchError('Unable to fetch %s' % url)

bitbake/lib/bb/fetch/svk.py

@@ -0,0 +1,109 @@
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+"""
+BitBake 'Fetch' implementations
+
+This implementation is for svk. It is based on the svn implementation
+
+"""
+
+# Copyright (C) 2006 Holger Hans Peter Freyther
+# Copyright (C) 2003, 2004  Chris Larson
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Based on functions from the base bb module, Copyright 2003 Holger Schurig
+
+import os, re
+import bb
+from   bb import data
+from   bb.fetch import Fetch
+from   bb.fetch import FetchError
+from   bb.fetch import MissingParameterError
+
+class Svk(Fetch):
+    """Class to fetch a module or modules from svk repositories"""
+    def supports(self, url, ud, d):
+        """
+        Check to see if a given url can be fetched with cvs.
+        """
+        return ud.type in ['svk']
+
+    def localpath(self, url, ud, d):
+        if not "module" in ud.parm:
+            raise MissingParameterError("svk method needs a 'module' parameter")
+        else:
+            ud.module = ud.parm["module"]
+
+        ud.revision = ""
+        if 'rev' in ud.parm:
+            ud.revision = ud.parm['rev']
+
+        ud.localfile = data.expand('%s_%s_%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision, ud.date), d)
+
+        return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile)
+
+    def forcefetch(self, url, ud, d):
+        if (ud.date == "now"):
+            return True
+        return False
+
+    def go(self, loc, ud, d):
+        """Fetch urls"""
+
+        if not self.forcefetch(loc, ud, d) and Fetch.try_mirror(d, ud.localfile):
+            return
+
+        svkroot = ud.host + ud.path
+
+        svkcmd = "svk co -r {%s} %s/%s" % (date, svkroot, ud.module)
+
+        if ud.revision:
+            svkcmd = "svk co -r %s/%s" % (ud.revision, svkroot, ud.module)
+
+        # create temp directory
+        localdata = data.createCopy(d)
+        data.update_data(localdata)
+        bb.msg.debug(2, bb.msg.domain.Fetcher, "Fetch: creating temporary directory")
+        bb.mkdirhier(data.expand('${WORKDIR}', localdata))
+        data.setVar('TMPBASE', data.expand('${WORKDIR}/oesvk.XXXXXX', localdata), localdata)
+        tmppipe = os.popen(data.getVar('MKTEMPDIRCMD', localdata, 1) or "false")
+        tmpfile = tmppipe.readline().strip()
+        if not tmpfile:
+            bb.msg.error(bb.msg.domain.Fetcher, "Fetch: unable to create temporary directory.. make sure 'mktemp' is in the PATH.")
+            raise FetchError(ud.module)
+
+        # check out sources there
+        os.chdir(tmpfile)
+        bb.msg.note(1, bb.msg.domain.Fetcher, "Fetch " + loc)
+        bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % svkcmd)
+        myret = os.system(svkcmd)
+        if myret != 0:
+            try:
+                os.rmdir(tmpfile)
+            except OSError:
+                pass
+            raise FetchError(ud.module)
+
+        os.chdir(os.path.join(tmpfile, os.path.dirname(ud.module)))
+        # tar them up to a defined filename
+        myret = os.system("tar -czf %s %s" % (ud.localpath, os.path.basename(ud.module)))
+        if myret != 0:
+            try:
+                os.unlink(ud.localpath)
+            except OSError:
+                pass
+            raise FetchError(ud.module)
+        # cleanup
+        os.system('rm -rf %s' % tmpfile)

bitbake/lib/bb/fetch/svn.py

@@ -0,0 +1,204 @@
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+"""
+BitBake 'Fetch' implementation for svn.
+
+"""
+
+# Copyright (C) 2003, 2004  Chris Larson
+# Copyright (C) 2004        Marcin Juszkiewicz
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Based on functions from the base bb module, Copyright 2003 Holger Schurig
+
+import os, re
+import sys
+import bb
+from   bb import data
+from   bb.fetch import Fetch
+from   bb.fetch import FetchError
+from   bb.fetch import MissingParameterError
+from   bb.fetch import runfetchcmd
+
+class Svn(Fetch):
+    """Class to fetch a module or modules from svn repositories"""
+    def supports(self, url, ud, d):
+        """
+        Check to see if a given url can be fetched with svn.
+        """
+        return ud.type in ['svn']
+
+    def localpath(self, url, ud, d):
+        if not "module" in ud.parm:
+            raise MissingParameterError("svn method needs a 'module' parameter")
+
+        ud.module = ud.parm["module"]
+
+        # Create paths to svn checkouts
+        relpath = ud.path
+        if relpath.startswith('/'):
+            # Remove leading slash as os.path.join can't cope
+            relpath = relpath[1:]
+        ud.pkgdir = os.path.join(data.expand('${SVNDIR}', d), ud.host, relpath)
+        ud.moddir = os.path.join(ud.pkgdir, ud.module)
+
+        if 'rev' in ud.parm:
+            ud.date = ""
+            ud.revision = ud.parm['rev']
+        elif 'date' in ud.date:
+            ud.date = ud.parm['date']
+            ud.revision = ""
+        else:
+            #
+            # ***Nasty hack***
+            # If DATE in unexpanded PV, use ud.date (which is set from SRCDATE)
+            # Should warn people to switch to SRCREV here
+            #
+            pv = data.getVar("PV", d, 0)
+            if "DATE" in pv:
+                ud.revision = ""
+            else:
+                rev = Fetch.srcrev_internal_helper(ud, d)
+                if rev is True:
+                    ud.revision = self.latest_revision(url, ud, d)
+                    ud.date = ""
+                elif rev:
+                    ud.revision = rev
+                    ud.date = ""
+                else:
+                    ud.revision = ""		
+
+        ud.localfile = data.expand('%s_%s_%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision, ud.date), d)
+
+        return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile)
+
+    def _buildsvncommand(self, ud, d, command):
+        """
+        Build up an svn commandline based on ud
+        command is "fetch", "update", "info"
+        """
+
+        basecmd = data.expand('${FETCHCMD_svn}', d)
+
+        proto = "svn"
+        if "proto" in ud.parm:
+            proto = ud.parm["proto"]
+
+        svn_rsh = None
+        if proto == "svn+ssh" and "rsh" in ud.parm:
+            svn_rsh = ud.parm["rsh"]
+
+        svnroot = ud.host + ud.path
+
+        # either use the revision, or SRCDATE in braces,
+        options = []
+
+        if ud.user:
+            options.append("--username %s" % ud.user)
+
+        if ud.pswd:
+            options.append("--password %s" % ud.pswd)
+
+        if command is "info":
+            svncmd = "%s info %s %s://%s/%s/" % (basecmd, " ".join(options), proto, svnroot, ud.module)
+        else:
+            if ud.revision:
+                options.append("-r %s" % ud.revision)
+            elif ud.date:
+                options.append("-r {%s}" % ud.date)
+
+            if command is "fetch":
+                svncmd = "%s co %s %s://%s/%s %s" % (basecmd, " ".join(options), proto, svnroot, ud.module, ud.module)
+            elif command is "update":
+                svncmd = "%s update %s" % (basecmd, " ".join(options))
+            else:
+                raise FetchError("Invalid svn command %s" % command)
+
+        if svn_rsh:
+            svncmd = "svn_RSH=\"%s\" %s" % (svn_rsh, svncmd)
+
+        return svncmd
+
+    def go(self, loc, ud, d):
+        """Fetch url"""
+
+        # try to use the tarball stash
+        if Fetch.try_mirror(d, ud.localfile):
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists or was mirrored, skipping svn checkout." % ud.localpath)
+            return
+
+        bb.msg.debug(2, bb.msg.domain.Fetcher, "Fetch: checking for module directory '" + ud.moddir + "'")
+
+        if os.access(os.path.join(ud.moddir, '.svn'), os.R_OK):
+            svnupdatecmd = self._buildsvncommand(ud, d, "update")
+            bb.msg.note(1, bb.msg.domain.Fetcher, "Update " + loc)
+            # update sources there
+            os.chdir(ud.moddir)
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % svnupdatecmd)
+            runfetchcmd(svnupdatecmd, d)
+        else:
+            svnfetchcmd = self._buildsvncommand(ud, d, "fetch")
+            bb.msg.note(1, bb.msg.domain.Fetcher, "Fetch " + loc)
+            # check out sources there
+            bb.mkdirhier(ud.pkgdir)
+            os.chdir(ud.pkgdir)
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % svnfetchcmd)
+            runfetchcmd(svnfetchcmd, d)
+
+        os.chdir(ud.pkgdir)
+        # tar them up to a defined filename
+        try:
+            runfetchcmd("tar -czf %s %s" % (ud.localpath, ud.module), d)
+        except:
+            t, v, tb = sys.exc_info()
+            try:
+                os.unlink(ud.localpath)
+            except OSError:
+                pass
+            raise t, v, tb
+
+    def suppports_srcrev(self):
+        return True
+
+    def _revision_key(self, url, ud, d):
+        """
+        Return a unique key for the url
+        """
+        return "svn:" + ud.moddir
+
+    def _latest_revision(self, url, ud, d):
+        """
+        Return the latest upstream revision number
+        """
+        bb.msg.debug(2, bb.msg.domain.Fetcher, "SVN fetcher hitting network for %s" % url)
+
+        output = runfetchcmd("LANG=C LC_ALL=C " + self._buildsvncommand(ud, d, "info"), d, True)
+
+        revision = None
+        for line in output.splitlines():
+            if "Last Changed Rev" in line:
+                revision = line.split(":")[1].strip()
+
+        return revision
+
+    def _sortable_revision(self, url, ud, d):
+        """
+        Return a sortable revision number which in our case is the revision number
+        """
+
+        return self._build_revision(url, ud, d)
+
+    def _build_revision(self, url, ud, d):
+        return ud.revision

bitbake/lib/bb/fetch/wget.py

@@ -0,0 +1,105 @@
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+"""
+BitBake 'Fetch' implementations
+
+Classes for obtaining upstream sources for the
+BitBake build tools.
+
+"""
+
+# Copyright (C) 2003, 2004  Chris Larson
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Based on functions from the base bb module, Copyright 2003 Holger Schurig
+
+import os, re
+import bb
+from   bb import data
+from   bb.fetch import Fetch
+from   bb.fetch import FetchError
+from   bb.fetch import uri_replace
+
+class Wget(Fetch):
+    """Class to fetch urls via 'wget'"""
+    def supports(self, url, ud, d):
+        """
+        Check to see if a given url can be fetched with cvs.
+        """
+        return ud.type in ['http','https','ftp']
+
+    def localpath(self, url, ud, d):
+
+        url = bb.encodeurl([ud.type, ud.host, ud.path, ud.user, ud.pswd, {}])
+        ud.basename = os.path.basename(ud.path)
+        ud.localfile = data.expand(os.path.basename(url), d)
+
+        return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile)
+
+    def go(self, uri, ud, d, checkonly = False):
+        """Fetch urls"""
+
+        def fetch_uri(uri, ud, d):
+            if checkonly:
+                fetchcmd = data.getVar("CHECKCOMMAND", d, 1)
+            elif os.path.exists(ud.localpath):
+                # file exists, but we didnt complete it.. trying again..
+                fetchcmd = data.getVar("RESUMECOMMAND", d, 1)
+            else:
+                fetchcmd = data.getVar("FETCHCOMMAND", d, 1)
+
+            bb.msg.note(1, bb.msg.domain.Fetcher, "fetch " + uri)
+            fetchcmd = fetchcmd.replace("${URI}", uri)
+            fetchcmd = fetchcmd.replace("${FILE}", ud.basename)
+            bb.msg.debug(2, bb.msg.domain.Fetcher, "executing " + fetchcmd)
+            ret = os.system(fetchcmd)
+            if ret != 0:
+                return False
+
+            # Sanity check since wget can pretend it succeed when it didn't
+            # Also, this used to happen if sourceforge sent us to the mirror page
+            if not os.path.exists(ud.localpath):
+                bb.msg.debug(2, bb.msg.domain.Fetcher, "The fetch command for %s returned success but %s doesn't exist?..." % (uri, ud.localpath))
+                return False
+
+            return True
+
+        localdata = data.createCopy(d)
+        data.setVar('OVERRIDES', "wget:" + data.getVar('OVERRIDES', localdata), localdata)
+        data.update_data(localdata)
+
+        premirrors = [ i.split() for i in (data.getVar('PREMIRRORS', localdata, 1) or "").split('\n') if i ]
+        for (find, replace) in premirrors:
+            newuri = uri_replace(uri, find, replace, d)
+            if newuri != uri:
+                if fetch_uri(newuri, ud, localdata):
+                    return True
+
+        if fetch_uri(uri, ud, localdata):
+            return True
+
+        # try mirrors
+        mirrors = [ i.split() for i in (data.getVar('MIRRORS', localdata, 1) or "").split('\n') if i ]
+        for (find, replace) in mirrors:
+            newuri = uri_replace(uri, find, replace, d)
+            if newuri != uri:
+                if fetch_uri(newuri, ud, localdata):
+                    return True
+
+        raise FetchError(uri)
+
+
+    def checkstatus(self, uri, ud, d):
+        return self.go(uri, ud, d, True)

bitbake/lib/bb/fetch2/bzr.py

@@ -1,143 +0,0 @@
-"""
-BitBake 'Fetch' implementation for bzr.
-
-"""
-
-# Copyright (C) 2007 Ross Burton
-# Copyright (C) 2007 Richard Purdie
-#
-#   Classes for obtaining upstream sources for the
-#   BitBake build tools.
-#   Copyright (C) 2003, 2004  Chris Larson
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import os
-import sys
-import logging
-import bb
-from bb import data
-from bb.fetch2 import FetchMethod
-from bb.fetch2 import FetchError
-from bb.fetch2 import runfetchcmd
-from bb.fetch2 import logger
-
-class Bzr(FetchMethod):
-    def supports(self, ud, d):
-        return ud.type in ['bzr']
-
-    def urldata_init(self, ud, d):
-        """
-        init bzr specific variable within url data
-        """
-        # Create paths to bzr checkouts
-        relpath = self._strip_leading_slashes(ud.path)
-        ud.pkgdir = os.path.join(data.expand('${BZRDIR}', d), ud.host, relpath)
-
-        ud.setup_revisons(d)
-
-        if not ud.revision:
-            ud.revision = self.latest_revision(ud, d)
-
-        ud.localfile = data.expand('bzr_%s_%s_%s.tar.gz' % (ud.host, ud.path.replace('/', '.'), ud.revision), d)
-
-    def _buildbzrcommand(self, ud, d, command):
-        """
-        Build up an bzr commandline based on ud
-        command is "fetch", "update", "revno"
-        """
-
-        basecmd = data.expand('${FETCHCMD_bzr}', d)
-
-        proto =  ud.parm.get('protocol', 'http')
-
-        bzrroot = ud.host + ud.path
-
-        options = []
-
-        if command == "revno":
-            bzrcmd = "%s revno %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot)
-        else:
-            if ud.revision:
-                options.append("-r %s" % ud.revision)
-
-            if command == "fetch":
-                bzrcmd = "%s branch %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot)
-            elif command == "update":
-                bzrcmd = "%s pull %s --overwrite" % (basecmd, " ".join(options))
-            else:
-                raise FetchError("Invalid bzr command %s" % command, ud.url)
-
-        return bzrcmd
-
-    def download(self, ud, d):
-        """Fetch url"""
-
-        if os.access(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir), '.bzr'), os.R_OK):
-            bzrcmd = self._buildbzrcommand(ud, d, "update")
-            logger.debug(1, "BZR Update %s", ud.url)
-            bb.fetch2.check_network_access(d, bzrcmd, ud.url)
-            os.chdir(os.path.join (ud.pkgdir, os.path.basename(ud.path)))
-            runfetchcmd(bzrcmd, d)
-        else:
-            bb.utils.remove(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir)), True)
-            bzrcmd = self._buildbzrcommand(ud, d, "fetch")
-            bb.fetch2.check_network_access(d, bzrcmd, ud.url)
-            logger.debug(1, "BZR Checkout %s", ud.url)
-            bb.utils.mkdirhier(ud.pkgdir)
-            os.chdir(ud.pkgdir)
-            logger.debug(1, "Running %s", bzrcmd)
-            runfetchcmd(bzrcmd, d)
-
-        os.chdir(ud.pkgdir)
-
-        scmdata = ud.parm.get("scmdata", "")
-        if scmdata == "keep":
-            tar_flags = ""
-        else:
-            tar_flags = "--exclude '.bzr' --exclude '.bzrtags'"
-
-        # tar them up to a defined filename
-        runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.basename(ud.pkgdir)), d, cleanup = [ud.localpath])
-
-    def supports_srcrev(self):
-        return True
-
-    def _revision_key(self, ud, d, name):
-        """
-        Return a unique key for the url
-        """
-        return "bzr:" + ud.pkgdir
-
-    def _latest_revision(self, ud, d, name):
-        """
-        Return the latest upstream revision number
-        """
-        logger.debug(2, "BZR fetcher hitting network for %s", ud.url)
-
-        bb.fetch2.check_network_access(d, self._buildbzrcommand(ud, d, "revno"), ud.url)
-
-        output = runfetchcmd(self._buildbzrcommand(ud, d, "revno"), d, True)
-
-        return output.strip()
-
-    def sortable_revision(self, ud, d, name):
-        """
-        Return a sortable revision number which in our case is the revision number
-        """
-
-        return False, self._build_revision(ud, d)
-
-    def _build_revision(self, ud, d):
-        return ud.revision

bitbake/lib/bb/fetch2/cvs.py

@@ -1,171 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-"""
-BitBake 'Fetch' implementations
-
-Classes for obtaining upstream sources for the
-BitBake build tools.
-
-"""
-
-# Copyright (C) 2003, 2004  Chris Larson
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-#Based on functions from the base bb module, Copyright 2003 Holger Schurig
-#
-
-import os
-import logging
-import bb
-from bb.fetch2 import FetchMethod, FetchError, MissingParameterError, logger
-from bb.fetch2 import runfetchcmd
-
-class Cvs(FetchMethod):
-    """
-    Class to fetch a module or modules from cvs repositories
-    """
-    def supports(self, ud, d):
-        """
-        Check to see if a given url can be fetched with cvs.
-        """
-        return ud.type in ['cvs']
-
-    def urldata_init(self, ud, d):
-        if not "module" in ud.parm:
-            raise MissingParameterError("module", ud.url)
-        ud.module = ud.parm["module"]
-
-        ud.tag = ud.parm.get('tag', "")
-
-        # Override the default date in certain cases
-        if 'date' in ud.parm:
-            ud.date = ud.parm['date']
-        elif ud.tag:
-            ud.date = ""
-
-        norecurse = ''
-        if 'norecurse' in ud.parm:
-            norecurse = '_norecurse'
-
-        fullpath = ''
-        if 'fullpath' in ud.parm:
-            fullpath = '_fullpath'
-
-        ud.localfile = bb.data.expand('%s_%s_%s_%s%s%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.tag, ud.date, norecurse, fullpath), d)
-
-    def need_update(self, ud, d):
-        if (ud.date == "now"):
-            return True
-        if not os.path.exists(ud.localpath):
-            return True
-        return False
-
-    def download(self, ud, d):
-
-        method = ud.parm.get('method', 'pserver')
-        localdir = ud.parm.get('localdir', ud.module)
-        cvs_port = ud.parm.get('port', '')
-
-        cvs_rsh = None
-        if method == "ext":
-            if "rsh" in ud.parm:
-                cvs_rsh = ud.parm["rsh"]
-
-        if method == "dir":
-            cvsroot = ud.path
-        else:
-            cvsroot = ":" + method
-            cvsproxyhost = d.getVar('CVS_PROXY_HOST', True)
-            if cvsproxyhost:
-                cvsroot += ";proxy=" + cvsproxyhost
-            cvsproxyport = d.getVar('CVS_PROXY_PORT', True)
-            if cvsproxyport:
-                cvsroot += ";proxyport=" + cvsproxyport
-            cvsroot += ":" + ud.user
-            if ud.pswd:
-                cvsroot += ":" + ud.pswd
-            cvsroot += "@" + ud.host + ":" + cvs_port + ud.path
-
-        options = []
-        if 'norecurse' in ud.parm:
-            options.append("-l")
-        if ud.date:
-            # treat YYYYMMDDHHMM specially for CVS
-            if len(ud.date) == 12:
-                options.append("-D \"%s %s:%s UTC\"" % (ud.date[0:8], ud.date[8:10], ud.date[10:12]))
-            else:
-                options.append("-D \"%s UTC\"" % ud.date)
-        if ud.tag:
-            options.append("-r %s" % ud.tag)
-
-        cvsbasecmd = d.getVar("FETCHCMD_cvs", True)
-        cvscmd = cvsbasecmd + " '-d" + cvsroot + "' co " + " ".join(options) + " " + ud.module
-        cvsupdatecmd = cvsbasecmd + " '-d" + cvsroot + "' update -d -P " + " ".join(options)
-
-        if cvs_rsh:
-            cvscmd = "CVS_RSH=\"%s\" %s" % (cvs_rsh, cvscmd)
-            cvsupdatecmd = "CVS_RSH=\"%s\" %s" % (cvs_rsh, cvsupdatecmd)
-
-        # create module directory
-        logger.debug(2, "Fetch: checking for module directory")
-        pkg = d.getVar('PN', True)
-        pkgdir = os.path.join(d.getVar('CVSDIR', True), pkg)
-        moddir = os.path.join(pkgdir, localdir)
-        if os.access(os.path.join(moddir, 'CVS'), os.R_OK):
-            logger.info("Update " + ud.url)
-            bb.fetch2.check_network_access(d, cvsupdatecmd, ud.url)
-            # update sources there
-            os.chdir(moddir)
-            cmd = cvsupdatecmd
-        else:
-            logger.info("Fetch " + ud.url)
-            # check out sources there
-            bb.utils.mkdirhier(pkgdir)
-            os.chdir(pkgdir)
-            logger.debug(1, "Running %s", cvscmd)
-            bb.fetch2.check_network_access(d, cvscmd, ud.url)
-            cmd = cvscmd
-
-        runfetchcmd(cmd, d, cleanup = [moddir])
-
-        if not os.access(moddir, os.R_OK):
-            raise FetchError("Directory %s was not readable despite sucessful fetch?!" % moddir, ud.url)
-
-        scmdata = ud.parm.get("scmdata", "")
-        if scmdata == "keep":
-            tar_flags = ""
-        else:
-            tar_flags = "--exclude 'CVS'"
-
-        # tar them up to a defined filename
-        if 'fullpath' in ud.parm:
-            os.chdir(pkgdir)
-            cmd = "tar %s -czf %s %s" % (tar_flags, ud.localpath, localdir)
-        else:
-            os.chdir(moddir)
-            os.chdir('..')
-            cmd = "tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.basename(moddir))
-
-        runfetchcmd(cmd, d, cleanup = [ud.localpath])
-
-    def clean(self, ud, d):
-        """ Clean CVS Files and tarballs """
-
-        pkg = d.getVar('PN', True)
-        pkgdir = os.path.join(d.getVar("CVSDIR", True), pkg)
-
-        bb.utils.remove(pkgdir, True)
-        bb.utils.remove(ud.localpath)
-

bitbake/lib/bb/fetch2/git.py

@@ -1,347 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-"""
-BitBake 'Fetch' git implementation
-
-git fetcher support the SRC_URI with format of:
-SRC_URI = "git://some.host/somepath;OptionA=xxx;OptionB=xxx;..."
-
-Supported SRC_URI options are:
-
-- branch
-   The git branch to retrieve from. The default is "master"
-
-   This option also supports multiple branch fetching, with branches
-   separated by commas.  In multiple branches case, the name option
-   must have the same number of names to match the branches, which is
-   used to specify the SRC_REV for the branch
-   e.g:
-   SRC_URI="git://some.host/somepath;branch=branchX,branchY;name=nameX,nameY"
-   SRCREV_nameX = "xxxxxxxxxxxxxxxxxxxx"
-   SRCREV_nameY = "YYYYYYYYYYYYYYYYYYYY"
-
-- tag
-    The git tag to retrieve. The default is "master"
-
-- protocol
-   The method to use to access the repository. Common options are "git",
-   "http", "https", "file", "ssh" and "rsync". The default is "git".
-
-- rebaseable
-   rebaseable indicates that the upstream git repo may rebase in the future,
-   and current revision may disappear from upstream repo. This option will
-   remind fetcher to preserve local cache carefully for future use.
-   The default value is "0", set rebaseable=1 for rebaseable git repo.
-
-- nocheckout
-   Don't checkout source code when unpacking. set this option for the recipe
-   who has its own routine to checkout code.
-   The default is "0", set nocheckout=1 if needed.
-
-- bareclone
-   Create a bare clone of the source code and don't checkout the source code
-   when unpacking. Set this option for the recipe who has its own routine to
-   checkout code and tracking branch requirements.
-   The default is "0", set bareclone=1 if needed.
-
-- nobranch
-   Don't check the SHA validation for branch. set this option for the recipe
-   referring to commit which is valid in tag instead of branch.
-   The default is "0", set nobranch=1 if needed.
-
-"""
-
-#Copyright (C) 2005 Richard Purdie
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import os
-import bb
-from   bb    import data
-from   bb.fetch2 import FetchMethod
-from   bb.fetch2 import runfetchcmd
-from   bb.fetch2 import logger
-
-class Git(FetchMethod):
-    """Class to fetch a module or modules from git repositories"""
-    def init(self, d):
-        pass
-
-    def supports(self, ud, d):
-        """
-        Check to see if a given url can be fetched with git.
-        """
-        return ud.type in ['git']
-
-    def supports_checksum(self, urldata):
-        return False
-
-    def urldata_init(self, ud, d):
-        """
-        init git specific variable within url data
-        so that the git method like latest_revision() can work
-        """
-        if 'protocol' in ud.parm:
-            ud.proto = ud.parm['protocol']
-        elif not ud.host:
-            ud.proto = 'file'
-        else:
-            ud.proto = "git"
-
-        if not ud.proto in ('git', 'file', 'ssh', 'http', 'https', 'rsync'):
-            raise bb.fetch2.ParameterError("Invalid protocol type", ud.url)
-
-        ud.nocheckout = ud.parm.get("nocheckout","0") == "1"
-
-        ud.rebaseable = ud.parm.get("rebaseable","0") == "1"
-
-        ud.nobranch = ud.parm.get("nobranch","0") == "1"
-
-        # bareclone implies nocheckout
-        ud.bareclone = ud.parm.get("bareclone","0") == "1"
-        if ud.bareclone:
-            ud.nocheckout = 1
-  
-        ud.unresolvedrev = {}
-        branches = ud.parm.get("branch", "master").split(',')
-        if len(branches) != len(ud.names):
-            raise bb.fetch2.ParameterError("The number of name and branch parameters is not balanced", ud.url)
-        ud.branches = {}
-        for name in ud.names:
-            branch = branches[ud.names.index(name)]
-            ud.branches[name] = branch
-            ud.unresolvedrev[name] = branch
-
-        ud.basecmd = data.getVar("FETCHCMD_git", d, True) or "git"
-
-        ud.write_tarballs = ((data.getVar("BB_GENERATE_MIRROR_TARBALLS", d, True) or "0") != "0") or ud.rebaseable
-
-        ud.setup_revisons(d)
-
-        for name in ud.names:
-            # Ensure anything that doesn't look like a sha256 checksum/revision is translated into one
-            if not ud.revisions[name] or len(ud.revisions[name]) != 40  or (False in [c in "abcdef0123456789" for c in ud.revisions[name]]):
-                if ud.revisions[name]:
-                    ud.unresolvedrev[name] = ud.revisions[name]
-                ud.revisions[name] = self.latest_revision(ud, d, name)
-
-        gitsrcname = '%s%s' % (ud.host.replace(':','.'), ud.path.replace('/', '.').replace('*', '.'))
-        # for rebaseable git repo, it is necessary to keep mirror tar ball
-        # per revision, so that even the revision disappears from the
-        # upstream repo in the future, the mirror will remain intact and still
-        # contains the revision
-        if ud.rebaseable:
-            for name in ud.names:
-                gitsrcname = gitsrcname + '_' + ud.revisions[name]
-        ud.mirrortarball = 'git2_%s.tar.gz' % (gitsrcname)
-        ud.fullmirror = os.path.join(d.getVar("DL_DIR", True), ud.mirrortarball)
-        gitdir = d.getVar("GITDIR", True) or (d.getVar("DL_DIR", True) + "/git2/")
-        ud.clonedir = os.path.join(gitdir, gitsrcname)
-
-        ud.localfile = ud.clonedir
-
-    def localpath(self, ud, d):
-        return ud.clonedir
-
-    def need_update(self, ud, d):
-        if not os.path.exists(ud.clonedir):
-            return True
-        os.chdir(ud.clonedir)
-        for name in ud.names:
-            if not self._contains_ref(ud, d, name):
-                return True
-        if ud.write_tarballs and not os.path.exists(ud.fullmirror):
-            return True
-        return False
-
-    def try_premirror(self, ud, d):
-        # If we don't do this, updating an existing checkout with only premirrors
-        # is not possible
-        if d.getVar("BB_FETCH_PREMIRRORONLY", True) is not None:
-            return True
-        if os.path.exists(ud.clonedir):
-            return False
-        return True
-
-    def download(self, ud, d):
-        """Fetch url"""
-
-        if ud.user:
-            username = ud.user + '@'
-        else:
-            username = ""
-
-        ud.repochanged = not os.path.exists(ud.fullmirror)
-
-        # If the checkout doesn't exist and the mirror tarball does, extract it
-        if not os.path.exists(ud.clonedir) and os.path.exists(ud.fullmirror):
-            bb.utils.mkdirhier(ud.clonedir)
-            os.chdir(ud.clonedir)
-            runfetchcmd("tar -xzf %s" % (ud.fullmirror), d)
-
-        repourl = "%s://%s%s%s" % (ud.proto, username, ud.host, ud.path)
-
-        # If the repo still doesn't exist, fallback to cloning it
-        if not os.path.exists(ud.clonedir):
-            # We do this since git will use a "-l" option automatically for local urls where possible
-            if repourl.startswith("file://"):
-                repourl = repourl[7:]
-            clone_cmd = "%s clone --bare --mirror %s %s" % (ud.basecmd, repourl, ud.clonedir)
-            if ud.proto.lower() != 'file':
-                bb.fetch2.check_network_access(d, clone_cmd)
-            runfetchcmd(clone_cmd, d)
-
-        os.chdir(ud.clonedir)
-        # Update the checkout if needed
-        needupdate = False
-        for name in ud.names:
-            if not self._contains_ref(ud, d, name):
-                needupdate = True
-        if needupdate:
-            try: 
-                runfetchcmd("%s remote rm origin" % ud.basecmd, d) 
-            except bb.fetch2.FetchError:
-                logger.debug(1, "No Origin")
-
-            runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, repourl), d)
-            fetch_cmd = "%s fetch -f --prune %s refs/*:refs/*" % (ud.basecmd, repourl)
-            if ud.proto.lower() != 'file':
-                bb.fetch2.check_network_access(d, fetch_cmd, ud.url)
-            runfetchcmd(fetch_cmd, d)
-            runfetchcmd("%s prune-packed" % ud.basecmd, d)
-            runfetchcmd("%s pack-redundant --all | xargs -r rm" % ud.basecmd, d)
-            ud.repochanged = True
-        os.chdir(ud.clonedir)
-        for name in ud.names:
-            if not self._contains_ref(ud, d, name):
-                raise bb.fetch2.FetchError("Unable to find revision %s in branch %s even from upstream" % (ud.revisions[name], ud.branches[name]))
-
-    def build_mirror_data(self, ud, d):
-        # Generate a mirror tarball if needed
-        if ud.write_tarballs and (ud.repochanged or not os.path.exists(ud.fullmirror)):
-            # it's possible that this symlink points to read-only filesystem with PREMIRROR
-            if os.path.islink(ud.fullmirror):
-                os.unlink(ud.fullmirror)
-
-            os.chdir(ud.clonedir)
-            logger.info("Creating tarball of git repository")
-            runfetchcmd("tar -czf %s %s" % (ud.fullmirror, os.path.join(".") ), d)
-            runfetchcmd("touch %s.done" % (ud.fullmirror), d)
-
-    def unpack(self, ud, destdir, d):
-        """ unpack the downloaded src to destdir"""
-
-        subdir = ud.parm.get("subpath", "")
-        if subdir != "":
-            readpathspec = ":%s" % (subdir)
-            def_destsuffix = "%s/" % os.path.basename(subdir)
-        else:
-            readpathspec = ""
-            def_destsuffix = "git/"
-
-        destsuffix = ud.parm.get("destsuffix", def_destsuffix)
-        destdir = ud.destdir = os.path.join(destdir, destsuffix)
-        if os.path.exists(destdir):
-            bb.utils.prunedir(destdir)
-
-        cloneflags = "-s -n"
-        if ud.bareclone:
-            cloneflags += " --mirror"
-
-        # Versions of git prior to 1.7.9.2 have issues where foo.git and foo get confused
-        # and you end up with some horrible union of the two when you attempt to clone it
-        # The least invasive workaround seems to be a symlink to the real directory to
-        # fool git into ignoring any .git version that may also be present.
-        #
-        # The issue is fixed in more recent versions of git so we can drop this hack in future
-        # when that version becomes common enough.
-        clonedir = ud.clonedir
-        if not ud.path.endswith(".git"):
-            indirectiondir = destdir[:-1] + ".indirectionsymlink"
-            if os.path.exists(indirectiondir):
-                os.remove(indirectiondir)
-            bb.utils.mkdirhier(os.path.dirname(indirectiondir))
-            os.symlink(ud.clonedir, indirectiondir)
-            clonedir = indirectiondir
-
-        runfetchcmd("git clone %s %s/ %s" % (cloneflags, clonedir, destdir), d)
-        if not ud.nocheckout:
-            os.chdir(destdir)
-            if subdir != "":
-                runfetchcmd("%s read-tree %s%s" % (ud.basecmd, ud.revisions[ud.names[0]], readpathspec), d)
-                runfetchcmd("%s checkout-index -q -f -a" % ud.basecmd, d)
-            else:
-                runfetchcmd("%s checkout %s" % (ud.basecmd, ud.revisions[ud.names[0]]), d)
-        return True
-
-    def clean(self, ud, d):
-        """ clean the git directory """
-
-        bb.utils.remove(ud.localpath, True)
-        bb.utils.remove(ud.fullmirror)
-        bb.utils.remove(ud.fullmirror + ".done")
-
-    def supports_srcrev(self):
-        return True
-
-    def _contains_ref(self, ud, d, name):
-        cmd = ""
-        if ud.nobranch:
-            cmd = "%s log --pretty=oneline -n 1 %s -- 2> /dev/null | wc -l" % (
-                ud.basecmd, ud.revisions[name])
-        else:
-            cmd =  "%s branch --contains %s --list %s 2> /dev/null | wc -l" % (
-                ud.basecmd, ud.revisions[name], ud.branches[name])
-        try:
-            output = runfetchcmd(cmd, d, quiet=True)
-        except bb.fetch2.FetchError:
-            return False
-        if len(output.split()) > 1:
-            raise bb.fetch2.FetchError("The command '%s' gave output with more then 1 line unexpectedly, output: '%s'" % (cmd, output))
-        return output.split()[0] != "0"
-
-    def _revision_key(self, ud, d, name):
-        """
-        Return a unique key for the url
-        """
-        return "git:" + ud.host + ud.path.replace('/', '.') + ud.unresolvedrev[name]
-
-    def _latest_revision(self, ud, d, name):
-        """
-        Compute the HEAD revision for the url
-        """
-        if ud.user:
-            username = ud.user + '@'
-        else:
-            username = ""
-
-        cmd = "%s ls-remote %s://%s%s%s refs/heads/%s refs/tags/%s^{}" % \
-              (ud.basecmd, ud.proto, username, ud.host, ud.path, ud.unresolvedrev[name], ud.unresolvedrev[name])
-        if ud.proto.lower() != 'file':
-            bb.fetch2.check_network_access(d, cmd)
-        output = runfetchcmd(cmd, d, True)
-        if not output:
-            raise bb.fetch2.FetchError("The command %s gave empty output unexpectedly" % cmd, ud.url)
-        return output.split()[0]
-
-    def _build_revision(self, ud, d, name):
-        return ud.revisions[name]
-
-    def checkstatus(self, ud, d):
-        fetchcmd = "%s ls-remote %s" % (ud.basecmd, ud.url)
-        try:
-            runfetchcmd(fetchcmd, d, quiet=True)
-            return True
-        except FetchError:
-            return False

bitbake/lib/bb/fetch2/gitannex.py

@@ -1,76 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-"""
-BitBake 'Fetch' git annex implementation
-"""
-
-# Copyright (C) 2014 Otavio Salvador
-# Copyright (C) 2014 O.S. Systems Software LTDA.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import os
-import bb
-from   bb import data
-from   bb.fetch2.git import Git
-from   bb.fetch2 import runfetchcmd
-from   bb.fetch2 import logger
-
-class GitANNEX(Git):
-    def supports(self, ud, d):
-        """
-        Check to see if a given url can be fetched with git.
-        """
-        return ud.type in ['gitannex']
-
-    def uses_annex(self, ud, d):
-        for name in ud.names:
-            try:
-                runfetchcmd("%s rev-list git-annex" % (ud.basecmd), d, quiet=True)
-                return True
-            except bb.fetch.FetchError:
-                pass
-
-        return False
-
-    def update_annex(self, ud, d):
-        try:
-            runfetchcmd("%s annex get --all" % (ud.basecmd), d, quiet=True)
-        except bb.fetch.FetchError:
-            return False
-        runfetchcmd("chmod u+w -R %s/annex" % (ud.clonedir), d, quiet=True)
-
-        return True
-
-    def download(self, ud, d):
-        Git.download(self, ud, d)
-
-        os.chdir(ud.clonedir)
-        annex = self.uses_annex(ud, d)
-        if annex:
-            self.update_annex(ud, d)
-
-    def unpack(self, ud, destdir, d):
-        Git.unpack(self, ud, destdir, d)
-
-        os.chdir(ud.destdir)
-        try:
-            runfetchcmd("%s annex sync" % (ud.basecmd), d)
-        except bb.fetch.FetchError:
-            pass
-
-        annex = self.uses_annex(ud, d)
-        if annex:
-            runfetchcmd("%s annex get" % (ud.basecmd), d)
-            runfetchcmd("chmod u+w -R %s/.git/annex" % (ud.destdir), d, quiet=True)

bitbake/lib/bb/fetch2/gitsm.py

@@ -1,78 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-"""
-BitBake 'Fetch' git submodules implementation
-"""
-
-# Copyright (C) 2013 Richard Purdie
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import os
-import bb
-from   bb    import data
-from   bb.fetch2.git import Git
-from   bb.fetch2 import runfetchcmd
-from   bb.fetch2 import logger
-
-class GitSM(Git):
-    def supports(self, ud, d):
-        """
-        Check to see if a given url can be fetched with git.
-        """
-        return ud.type in ['gitsm']
-
-    def uses_submodules(self, ud, d):
-        for name in ud.names:
-            try:
-                runfetchcmd("%s show %s:.gitmodules" % (ud.basecmd, ud.revisions[name]), d, quiet=True)
-                return True
-            except bb.fetch.FetchError:
-                pass
-        return False
-
-    def update_submodules(self, ud, d):
-        # We have to convert bare -> full repo, do the submodule bit, then convert back
-        tmpclonedir = ud.clonedir + ".tmp"
-        gitdir = tmpclonedir + os.sep + ".git"
-        bb.utils.remove(tmpclonedir, True)
-        os.mkdir(tmpclonedir)
-        os.rename(ud.clonedir, gitdir)
-        runfetchcmd("sed " + gitdir + "/config -i -e 's/bare.*=.*true/bare = false/'", d)
-        os.chdir(tmpclonedir)
-        runfetchcmd(ud.basecmd + " reset --hard", d)
-        runfetchcmd(ud.basecmd + " submodule init", d)
-        runfetchcmd(ud.basecmd + " submodule update", d)
-        runfetchcmd("sed " + gitdir + "/config -i -e 's/bare.*=.*false/bare = true/'", d)
-        os.rename(gitdir, ud.clonedir,)
-        bb.utils.remove(tmpclonedir, True)
-
-    def download(self, ud, d):
-        Git.download(self, ud, d)
-
-        os.chdir(ud.clonedir)
-        submodules = self.uses_submodules(ud, d)
-        if submodules:
-            self.update_submodules(ud, d)
-
-    def unpack(self, ud, destdir, d):
-        Git.unpack(self, ud, destdir, d)
-        
-        os.chdir(ud.destdir)
-        submodules = self.uses_submodules(ud, d)
-        if submodules:
-            runfetchcmd("cp -r " + ud.clonedir + "/modules " + ud.destdir + "/.git/", d)
-            runfetchcmd(ud.basecmd + " submodule init", d)
-            runfetchcmd(ud.basecmd + " submodule update", d)
-

bitbake/lib/bb/fetch2/hg.py

@@ -1,187 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-"""
-BitBake 'Fetch' implementation for mercurial DRCS (hg).
-
-"""
-
-# Copyright (C) 2003, 2004  Chris Larson
-# Copyright (C) 2004        Marcin Juszkiewicz
-# Copyright (C) 2007        Robert Schuster
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Based on functions from the base bb module, Copyright 2003 Holger Schurig
-
-import os
-import sys
-import logging
-import bb
-from bb import data
-from bb.fetch2 import FetchMethod
-from bb.fetch2 import FetchError
-from bb.fetch2 import MissingParameterError
-from bb.fetch2 import runfetchcmd
-from bb.fetch2 import logger
-
-class Hg(FetchMethod):
-    """Class to fetch from mercurial repositories"""
-    def supports(self, ud, d):
-        """
-        Check to see if a given url can be fetched with mercurial.
-        """
-        return ud.type in ['hg']
-
-    def urldata_init(self, ud, d):
-        """
-        init hg specific variable within url data
-        """
-        if not "module" in ud.parm:
-            raise MissingParameterError('module', ud.url)
-
-        ud.module = ud.parm["module"]
-
-        # Create paths to mercurial checkouts
-        relpath = self._strip_leading_slashes(ud.path)
-        ud.pkgdir = os.path.join(data.expand('${HGDIR}', d), ud.host, relpath)
-        ud.moddir = os.path.join(ud.pkgdir, ud.module)
-
-        ud.setup_revisons(d)
-
-        if 'rev' in ud.parm:
-            ud.revision = ud.parm['rev']
-        elif not ud.revision:
-            ud.revision = self.latest_revision(ud, d)
-
-        ud.localfile = data.expand('%s_%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision), d)
-
-    def need_update(self, ud, d):
-        revTag = ud.parm.get('rev', 'tip')
-        if revTag == "tip":
-            return True
-        if not os.path.exists(ud.localpath):
-            return True
-        return False
-
-    def _buildhgcommand(self, ud, d, command):
-        """
-        Build up an hg commandline based on ud
-        command is "fetch", "update", "info"
-        """
-
-        basecmd = data.expand('${FETCHCMD_hg}', d)
-
-        proto = ud.parm.get('protocol', 'http')
-
-        host = ud.host
-        if proto == "file":
-            host = "/"
-            ud.host = "localhost"
-
-        if not ud.user:
-            hgroot = host + ud.path
-        else:
-            if ud.pswd:
-                hgroot = ud.user + ":" + ud.pswd + "@" + host + ud.path
-            else:
-                hgroot = ud.user + "@" + host + ud.path
-
-        if command == "info":
-            return "%s identify -i %s://%s/%s" % (basecmd, proto, hgroot, ud.module)
-
-        options = [];
-
-        # Don't specify revision for the fetch; clone the entire repo.
-        # This avoids an issue if the specified revision is a tag, because
-        # the tag actually exists in the specified revision + 1, so it won't
-        # be available when used in any successive commands.
-        if ud.revision and command != "fetch":
-            options.append("-r %s" % ud.revision)
-
-        if command == "fetch":
-            cmd = "%s clone %s %s://%s/%s %s" % (basecmd, " ".join(options), proto, hgroot, ud.module, ud.module)
-        elif command == "pull":
-            # do not pass options list; limiting pull to rev causes the local
-            # repo not to contain it and immediately following "update" command
-            # will crash
-            if ud.user and ud.pswd:
-                cmd = "%s --config auth.default.prefix=* --config auth.default.username=%s --config auth.default.password=%s --config \"auth.default.schemes=%s\" pull" % (basecmd, ud.user, ud.pswd, proto)
-            else:
-                cmd = "%s pull" % (basecmd)
-        elif command == "update":
-            cmd = "%s update -C %s" % (basecmd, " ".join(options))
-        else:
-            raise FetchError("Invalid hg command %s" % command, ud.url)
-
-        return cmd
-
-    def download(self, ud, d):
-        """Fetch url"""
-
-        logger.debug(2, "Fetch: checking for module directory '" + ud.moddir + "'")
-
-        if os.access(os.path.join(ud.moddir, '.hg'), os.R_OK):
-            updatecmd = self._buildhgcommand(ud, d, "pull")
-            logger.info("Update " + ud.url)
-            # update sources there
-            os.chdir(ud.moddir)
-            logger.debug(1, "Running %s", updatecmd)
-            bb.fetch2.check_network_access(d, updatecmd, ud.url)
-            runfetchcmd(updatecmd, d)
-
-        else:
-            fetchcmd = self._buildhgcommand(ud, d, "fetch")
-            logger.info("Fetch " + ud.url)
-            # check out sources there
-            bb.utils.mkdirhier(ud.pkgdir)
-            os.chdir(ud.pkgdir)
-            logger.debug(1, "Running %s", fetchcmd)
-            bb.fetch2.check_network_access(d, fetchcmd, ud.url)
-            runfetchcmd(fetchcmd, d)
-
-        # Even when we clone (fetch), we still need to update as hg's clone
-        # won't checkout the specified revision if its on a branch
-        updatecmd = self._buildhgcommand(ud, d, "update")
-        os.chdir(ud.moddir)
-        logger.debug(1, "Running %s", updatecmd)
-        runfetchcmd(updatecmd, d)
-
-        scmdata = ud.parm.get("scmdata", "")
-        if scmdata == "keep":
-            tar_flags = ""
-        else:
-            tar_flags = "--exclude '.hg' --exclude '.hgrags'"
-
-        os.chdir(ud.pkgdir)
-        runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, ud.module), d, cleanup = [ud.localpath])
-
-    def supports_srcrev(self):
-        return True
-
-    def _latest_revision(self, ud, d, name):
-        """
-        Compute tip revision for the url
-        """
-        bb.fetch2.check_network_access(d, self._buildhgcommand(ud, d, "info"))
-        output = runfetchcmd(self._buildhgcommand(ud, d, "info"), d)
-        return output.strip()
-
-    def _build_revision(self, ud, d, name):
-        return ud.revision
-
-    def _revision_key(self, ud, d, name):
-        """
-        Return a unique key for the url
-        """
-        return "hg:" + ud.moddir

bitbake/lib/bb/fetch2/local.py

@@ -1,116 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-"""
-BitBake 'Fetch' implementations
-
-Classes for obtaining upstream sources for the
-BitBake build tools.
-
-"""
-
-# Copyright (C) 2003, 2004  Chris Larson
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Based on functions from the base bb module, Copyright 2003 Holger Schurig
-
-import os
-import urllib
-import bb
-import bb.utils
-from   bb import data
-from   bb.fetch2 import FetchMethod, FetchError
-from   bb.fetch2 import logger
-
-class Local(FetchMethod):
-    def supports(self, urldata, d):
-        """
-        Check to see if a given url represents a local fetch.
-        """
-        return urldata.type in ['file']
-
-    def urldata_init(self, ud, d):
-        # We don't set localfile as for this fetcher the file is already local!
-        ud.decodedurl = urllib.unquote(ud.url.split("://")[1].split(";")[0])
-        ud.basename = os.path.basename(ud.decodedurl)
-        ud.basepath = ud.decodedurl
-        return
-
-    def localpath(self, urldata, d):
-        """
-        Return the local filename of a given url assuming a successful fetch.
-        """
-        path = urldata.decodedurl
-        newpath = path
-        if path[0] != "/":
-            filespath = data.getVar('FILESPATH', d, True)
-            if filespath:
-                logger.debug(2, "Searching for %s in paths:    \n%s" % (path, "\n    ".join(filespath.split(":"))))
-                newpath = bb.utils.which(filespath, path)
-            if not newpath:
-                filesdir = data.getVar('FILESDIR', d, True)
-                if filesdir:
-                    logger.debug(2, "Searching for %s in path: %s" % (path, filesdir))
-                    newpath = os.path.join(filesdir, path)
-            if (not newpath or not os.path.exists(newpath)) and path.find("*") != -1:
-                # For expressions using '*', best we can do is take the first directory in FILESPATH that exists
-                newpath = bb.utils.which(filespath, ".")
-                logger.debug(2, "Searching for %s in path: %s" % (path, newpath))
-                return newpath
-            if not os.path.exists(newpath):
-                dldirfile = os.path.join(d.getVar("DL_DIR", True), path)
-                logger.debug(2, "Defaulting to %s for %s" % (dldirfile, path))
-                bb.utils.mkdirhier(os.path.dirname(dldirfile))
-                return dldirfile
-        return newpath
-
-    def need_update(self, ud, d):
-        if ud.url.find("*") != -1:
-            return False
-        if os.path.exists(ud.localpath):
-            return False
-        return True
-
-    def download(self, urldata, d):
-        """Fetch urls (no-op for Local method)"""
-        # no need to fetch local files, we'll deal with them in place.
-        if self.supports_checksum(urldata) and not os.path.exists(urldata.localpath):
-            locations = []
-            filespath = data.getVar('FILESPATH', d, True)
-            if filespath:
-                locations = filespath.split(":")
-            filesdir = data.getVar('FILESDIR', d, True)
-            if filesdir:
-                locations.append(filesdir)
-            locations.append(d.getVar("DL_DIR", True))
-
-            msg = "Unable to find file " + urldata.url + " anywhere. The paths that were searched were:\n    " + "\n    ".join(locations)
-            raise FetchError(msg)
-
-        return True
-
-    def checkstatus(self, urldata, d):
-        """
-        Check the status of the url
-        """
-        if urldata.localpath.find("*") != -1:
-            logger.info("URL %s looks like a glob and was therefore not checked.", urldata.url)
-            return True
-        if os.path.exists(urldata.localpath):
-            return True
-        return False
-
-    def clean(self, urldata, d):
-        return
-

bitbake/lib/bb/fetch2/osc.py

@@ -1,135 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-"""
-Bitbake "Fetch" implementation for osc (Opensuse build service client).
-Based on the svn "Fetch" implementation.
-
-"""
-
-import  os
-import  sys
-import logging
-import  bb
-from    bb       import data
-from    bb.fetch2 import FetchMethod
-from    bb.fetch2 import FetchError
-from    bb.fetch2 import MissingParameterError
-from    bb.fetch2 import runfetchcmd
-
-class Osc(FetchMethod):
-    """Class to fetch a module or modules from Opensuse build server
-       repositories."""
-
-    def supports(self, ud, d):
-        """
-        Check to see if a given url can be fetched with osc.
-        """
-        return ud.type in ['osc']
-
-    def urldata_init(self, ud, d):
-        if not "module" in ud.parm:
-            raise MissingParameterError('module', ud.url)
-
-        ud.module = ud.parm["module"]
-
-        # Create paths to osc checkouts
-        relpath = self._strip_leading_slashes(ud.path)
-        ud.pkgdir = os.path.join(data.expand('${OSCDIR}', d), ud.host)
-        ud.moddir = os.path.join(ud.pkgdir, relpath, ud.module)
-
-        if 'rev' in ud.parm:
-            ud.revision = ud.parm['rev']
-        else:
-            pv = data.getVar("PV", d, 0)
-            rev = bb.fetch2.srcrev_internal_helper(ud, d)
-            if rev and rev != True:
-                ud.revision = rev
-            else:
-                ud.revision = ""
-
-        ud.localfile = data.expand('%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.path.replace('/', '.'), ud.revision), d)
-
-    def _buildosccommand(self, ud, d, command):
-        """
-        Build up an ocs commandline based on ud
-        command is "fetch", "update", "info"
-        """
-
-        basecmd = data.expand('${FETCHCMD_osc}', d)
-
-        proto = ud.parm.get('protocol', 'ocs')
-
-        options = []
-
-        config = "-c %s" % self.generate_config(ud, d)
-
-        if ud.revision:
-            options.append("-r %s" % ud.revision)
-
-        coroot = self._strip_leading_slashes(ud.path)
-
-        if command == "fetch":
-            osccmd = "%s %s co %s/%s %s" % (basecmd, config, coroot, ud.module, " ".join(options))
-        elif command == "update":
-            osccmd = "%s %s up %s" % (basecmd, config, " ".join(options))
-        else:
-            raise FetchError("Invalid osc command %s" % command, ud.url)
-
-        return osccmd
-
-    def download(self, ud, d):
-        """
-        Fetch url
-        """
-
-        logger.debug(2, "Fetch: checking for module directory '" + ud.moddir + "'")
-
-        if os.access(os.path.join(data.expand('${OSCDIR}', d), ud.path, ud.module), os.R_OK):
-            oscupdatecmd = self._buildosccommand(ud, d, "update")
-            logger.info("Update "+ ud.url)
-            # update sources there
-            os.chdir(ud.moddir)
-            logger.debug(1, "Running %s", oscupdatecmd)
-            bb.fetch2.check_network_access(d, oscupdatecmd, ud.url)
-            runfetchcmd(oscupdatecmd, d)
-        else:
-            oscfetchcmd = self._buildosccommand(ud, d, "fetch")
-            logger.info("Fetch " + ud.url)
-            # check out sources there
-            bb.utils.mkdirhier(ud.pkgdir)
-            os.chdir(ud.pkgdir)
-            logger.debug(1, "Running %s", oscfetchcmd)
-            bb.fetch2.check_network_access(d, oscfetchcmd, ud.url)
-            runfetchcmd(oscfetchcmd, d)
-
-        os.chdir(os.path.join(ud.pkgdir + ud.path))
-        # tar them up to a defined filename
-        runfetchcmd("tar -czf %s %s" % (ud.localpath, ud.module), d, cleanup = [ud.localpath])
-
-    def supports_srcrev(self):
-        return False
-
-    def generate_config(self, ud, d):
-        """
-        Generate a .oscrc to be used for this run.
-        """
-
-        config_path = os.path.join(data.expand('${OSCDIR}', d), "oscrc")
-        if (os.path.exists(config_path)):
-            os.remove(config_path)
-
-        f = open(config_path, 'w')
-        f.write("[general]\n")
-        f.write("apisrv = %s\n" % ud.host)
-        f.write("scheme = http\n")
-        f.write("su-wrapper = su -c\n")
-        f.write("build-root = %s\n" % data.expand('${WORKDIR}', d))
-        f.write("urllist = http://moblin-obs.jf.intel.com:8888/build/%(project)s/%(repository)s/%(buildarch)s/:full/%(name)s.rpm\n")
-        f.write("extra-pkgs = gzip\n")
-        f.write("\n")
-        f.write("[%s]\n" % ud.host)
-        f.write("user = %s\n" % ud.parm["user"])
-        f.write("pass = %s\n" % ud.parm["pswd"])
-        f.close()
-
-        return config_path

bitbake/lib/bb/fetch2/perforce.py

@@ -1,198 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-"""
-BitBake 'Fetch' implementations
-
-Classes for obtaining upstream sources for the
-BitBake build tools.
-
-"""
-
-# Copyright (C) 2003, 2004  Chris Larson
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Based on functions from the base bb module, Copyright 2003 Holger Schurig
-
-from future_builtins import zip
-import os
-import subprocess
-import logging
-import bb
-from   bb import data
-from   bb.fetch2 import FetchMethod
-from   bb.fetch2 import FetchError
-from   bb.fetch2 import logger
-from   bb.fetch2 import runfetchcmd
-
-class Perforce(FetchMethod):
-    def supports(self, ud, d):
-        return ud.type in ['p4']
-
-    def doparse(url, d):
-        parm = {}
-        path = url.split("://")[1]
-        delim = path.find("@");
-        if delim != -1:
-            (user, pswd, host, port) = path.split('@')[0].split(":")
-            path = path.split('@')[1]
-        else:
-            (host, port) = data.getVar('P4PORT', d).split(':')
-            user = ""
-            pswd = ""
-
-        if path.find(";") != -1:
-            keys=[]
-            values=[]
-            plist = path.split(';')
-            for item in plist:
-                if item.count('='):
-                    (key, value) = item.split('=')
-                    keys.append(key)
-                    values.append(value)
-
-            parm = dict(zip(keys, values))
-        path = "//" + path.split(';')[0]
-        host += ":%s" % (port)
-        parm["cset"] = Perforce.getcset(d, path, host, user, pswd, parm)
-
-        return host, path, user, pswd, parm
-    doparse = staticmethod(doparse)
-
-    def getcset(d, depot, host, user, pswd, parm):
-        p4opt = ""
-        if "cset" in parm:
-            return parm["cset"];
-        if user:
-            p4opt += " -u %s" % (user)
-        if pswd:
-            p4opt += " -P %s" % (pswd)
-        if host:
-            p4opt += " -p %s" % (host)
-
-        p4date = data.getVar("P4DATE", d, True)
-        if "revision" in parm:
-            depot += "#%s" % (parm["revision"])
-        elif "label" in parm:
-            depot += "@%s" % (parm["label"])
-        elif p4date:
-            depot += "@%s" % (p4date)
-
-        p4cmd = data.getVar('FETCHCOMMAND_p4', d, True)
-        logger.debug(1, "Running %s%s changes -m 1 %s", p4cmd, p4opt, depot)
-        p4file, errors = bb.process.run("%s%s changes -m 1 %s" % (p4cmd, p4opt, depot))
-        cset = p4file.strip()
-        logger.debug(1, "READ %s", cset)
-        if not cset:
-            return -1
-
-        return cset.split(' ')[1]
-    getcset = staticmethod(getcset)
-
-    def urldata_init(self, ud, d):
-        (host, path, user, pswd, parm) = Perforce.doparse(ud.url, d)
-
-        # If a label is specified, we use that as our filename
-
-        if "label" in parm:
-            ud.localfile = "%s.tar.gz" % (parm["label"])
-            return
-
-        base = path
-        which = path.find('/...')
-        if which != -1:
-            base = path[:which-1]
-
-        base = self._strip_leading_slashes(base)
-
-        cset = Perforce.getcset(d, path, host, user, pswd, parm)
-
-        ud.localfile = data.expand('%s+%s+%s.tar.gz' % (host, base.replace('/', '.'), cset), d)
-
-    def download(self, ud, d):
-        """
-        Fetch urls
-        """
-
-        (host, depot, user, pswd, parm) = Perforce.doparse(ud.url, d)
-
-        if depot.find('/...') != -1:
-            path = depot[:depot.find('/...')]
-        else:
-            path = depot
-
-        module = parm.get('module', os.path.basename(path))
-
-        localdata = data.createCopy(d)
-        data.setVar('OVERRIDES', "p4:%s" % data.getVar('OVERRIDES', localdata), localdata)
-        data.update_data(localdata)
-
-        # Get the p4 command
-        p4opt = ""
-        if user:
-            p4opt += " -u %s" % (user)
-
-        if pswd:
-            p4opt += " -P %s" % (pswd)
-
-        if host:
-            p4opt += " -p %s" % (host)
-
-        p4cmd = data.getVar('FETCHCOMMAND', localdata, True)
-
-        # create temp directory
-        logger.debug(2, "Fetch: creating temporary directory")
-        bb.utils.mkdirhier(data.expand('${WORKDIR}', localdata))
-        data.setVar('TMPBASE', data.expand('${WORKDIR}/oep4.XXXXXX', localdata), localdata)
-        tmpfile, errors = bb.process.run(data.getVar('MKTEMPDIRCMD', localdata, True) or "false")
-        tmpfile = tmpfile.strip()
-        if not tmpfile:
-            raise FetchError("Fetch: unable to create temporary directory.. make sure 'mktemp' is in the PATH.", ud.url)
-
-        if "label" in parm:
-            depot = "%s@%s" % (depot, parm["label"])
-        else:
-            cset = Perforce.getcset(d, depot, host, user, pswd, parm)
-            depot = "%s@%s" % (depot, cset)
-
-        os.chdir(tmpfile)
-        logger.info("Fetch " + ud.url)
-        logger.info("%s%s files %s", p4cmd, p4opt, depot)
-        p4file, errors = bb.process.run("%s%s files %s" % (p4cmd, p4opt, depot))
-        p4file = [f.rstrip() for f in p4file.splitlines()]
-
-        if not p4file:
-            raise FetchError("Fetch: unable to get the P4 files from %s" % depot, ud.url)
-
-        count = 0
-
-        for file in p4file:
-            list = file.split()
-
-            if list[2] == "delete":
-                continue
-
-            dest = list[0][len(path)+1:]
-            where = dest.find("#")
-
-            subprocess.call("%s%s print -o %s/%s %s" % (p4cmd, p4opt, module, dest[:where], list[0]), shell=True)
-            count = count + 1
-
-        if count == 0:
-            logger.error()
-            raise FetchError("Fetch: No files gathered from the P4 fetch", ud.url)
-
-        runfetchcmd("tar -czf %s %s" % (ud.localpath, module), d, cleanup = [ud.localpath])
-        # cleanup
-        bb.utils.prunedir(tmpfile)

bitbake/lib/bb/fetch2/repo.py

@@ -1,98 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-"""
-BitBake "Fetch" repo (git) implementation
-
-"""
-
-# Copyright (C) 2009 Tom Rini <trini@embeddedalley.com>
-#
-# Based on git.py which is:
-#Copyright (C) 2005 Richard Purdie
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import os
-import bb
-from   bb    import data
-from   bb.fetch2 import FetchMethod
-from   bb.fetch2 import runfetchcmd
-
-class Repo(FetchMethod):
-    """Class to fetch a module or modules from repo (git) repositories"""
-    def supports(self, ud, d):
-        """
-        Check to see if a given url can be fetched with repo.
-        """
-        return ud.type in ["repo"]
-
-    def urldata_init(self, ud, d):
-        """
-        We don"t care about the git rev of the manifests repository, but
-        we do care about the manifest to use.  The default is "default".
-        We also care about the branch or tag to be used.  The default is
-        "master".
-        """
-
-        ud.proto = ud.parm.get('protocol', 'git')
-        ud.branch = ud.parm.get('branch', 'master')
-        ud.manifest = ud.parm.get('manifest', 'default.xml')
-        if not ud.manifest.endswith('.xml'):
-            ud.manifest += '.xml'
-
-        ud.localfile = data.expand("repo_%s%s_%s_%s.tar.gz" % (ud.host, ud.path.replace("/", "."), ud.manifest, ud.branch), d)
-
-    def download(self, ud, d):
-        """Fetch url"""
-
-        if os.access(os.path.join(data.getVar("DL_DIR", d, True), ud.localfile), os.R_OK):
-            logger.debug(1, "%s already exists (or was stashed). Skipping repo init / sync.", ud.localpath)
-            return
-
-        gitsrcname = "%s%s" % (ud.host, ud.path.replace("/", "."))
-        repodir = data.getVar("REPODIR", d, True) or os.path.join(data.getVar("DL_DIR", d, True), "repo")
-        codir = os.path.join(repodir, gitsrcname, ud.manifest)
-
-        if ud.user:
-            username = ud.user + "@"
-        else:
-            username = ""
-
-        bb.utils.mkdirhier(os.path.join(codir, "repo"))
-        os.chdir(os.path.join(codir, "repo"))
-        if not os.path.exists(os.path.join(codir, "repo", ".repo")):
-            bb.fetch2.check_network_access(d, "repo init -m %s -b %s -u %s://%s%s%s" % (ud.manifest, ud.branch, ud.proto, username, ud.host, ud.path), ud.url)
-            runfetchcmd("repo init -m %s -b %s -u %s://%s%s%s" % (ud.manifest, ud.branch, ud.proto, username, ud.host, ud.path), d)
-
-        bb.fetch2.check_network_access(d, "repo sync %s" % ud.url, ud.url)
-        runfetchcmd("repo sync", d)
-        os.chdir(codir)
-
-        scmdata = ud.parm.get("scmdata", "")
-        if scmdata == "keep":
-            tar_flags = ""
-        else:
-            tar_flags = "--exclude '.repo' --exclude '.git'"
-
-        # Create a cache
-        runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.join(".", "*") ), d)
-
-    def supports_srcrev(self):
-        return False
-
-    def _build_revision(self, ud, d):
-        return ud.manifest
-
-    def _want_sortable_revision(self, ud, d):
-        return False

bitbake/lib/bb/fetch2/sftp.py

@@ -1,129 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-"""
-BitBake SFTP Fetch implementation
-
-Class for fetching files via SFTP. It tries to adhere to the (now
-expired) IETF Internet Draft for "Uniform Resource Identifier (URI)
-Scheme for Secure File Transfer Protocol (SFTP) and Secure Shell
-(SSH)" (SECSH URI).
-
-It uses SFTP (as to adhere to the SECSH URI specification). It only
-supports key based authentication, not password. This class, unlike
-the SSH fetcher, does not support fetching a directory tree from the
-remote.
-
-  http://tools.ietf.org/html/draft-ietf-secsh-scp-sftp-ssh-uri-04
-  https://www.iana.org/assignments/uri-schemes/prov/sftp
-  https://tools.ietf.org/html/draft-ietf-secsh-filexfer-13
-
-Please note that '/' is used as host path seperator, and not ":"
-as you may be used to from the scp/sftp commands. You can use a
-~ (tilde) to specify a path relative to your home directory.
-(The /~user/ syntax, for specyfing a path relative to another
-user's home directory is not supported.) Note that the tilde must
-still follow the host path seperator ("/"). See exampels below.
-
-Example SRC_URIs:
-
-SRC_URI = "sftp://host.example.com/dir/path.file.txt"
-
-A path relative to your home directory.
-
-SRC_URI = "sftp://host.example.com/~/dir/path.file.txt"
-
-You can also specify a username (specyfing password in the
-URI is not supported, use SSH keys to authenticate):
-
-SRC_URI = "sftp://user@host.example.com/dir/path.file.txt"
-
-"""
-
-# Copyright (C) 2013, Olof Johansson <olof.johansson@axis.com>
-#
-# Based in part on bb.fetch2.wget:
-#    Copyright (C) 2003, 2004  Chris Larson
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Based on functions from the base bb module, Copyright 2003 Holger Schurig
-
-import os
-import bb
-import urllib
-import commands
-from bb import data
-from bb.fetch2 import URI
-from bb.fetch2 import FetchMethod
-from bb.fetch2 import runfetchcmd
-
-
-class SFTP(FetchMethod):
-    """Class to fetch urls via 'sftp'"""
-
-    def supports(self, ud, d):
-        """
-        Check to see if a given url can be fetched with sftp.
-        """
-        return ud.type in ['sftp']
-
-    def recommends_checksum(self, urldata):
-        return True
-
-    def urldata_init(self, ud, d):
-        if 'protocol' in ud.parm and ud.parm['protocol'] == 'git':
-            raise bb.fetch2.ParameterError(
-                "Invalid protocol - if you wish to fetch from a " +
-                "git repository using ssh, you need to use the " +
-                "git:// prefix with protocol=ssh", ud.url)
-
-        if 'downloadfilename' in ud.parm:
-            ud.basename = ud.parm['downloadfilename']
-        else:
-            ud.basename = os.path.basename(ud.path)
-
-        ud.localfile = data.expand(urllib.unquote(ud.basename), d)
-
-    def download(self, ud, d):
-        """Fetch urls"""
-
-        urlo = URI(ud.url)
-        basecmd = 'sftp -oPasswordAuthentication=no'
-        port = ''
-        if urlo.port:
-            port = '-P %d' % urlo.port
-            urlo.port = None
-
-        dldir = data.getVar('DL_DIR', d, True)
-        lpath = os.path.join(dldir, ud.localfile)
-
-        user = ''
-        if urlo.userinfo:
-            user = urlo.userinfo + '@'
-
-        path = urlo.path
-
-        # Supoprt URIs relative to the user's home directory, with
-        # the tilde syntax. (E.g. <sftp://example.com/~/foo.diff>).
-        if path[:3] == '/~/':
-            path = path[3:]
-
-        remote = '%s%s:%s' % (user, urlo.hostname, path)
-
-        cmd = '%s %s %s %s' % (basecmd, port, commands.mkarg(remote),
-                               commands.mkarg(lpath))
-
-        bb.fetch2.check_network_access(d, cmd, ud.url)
-        runfetchcmd(cmd, d)
-        return True

bitbake/lib/bb/fetch2/ssh.py

@@ -1,127 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-'''
-BitBake 'Fetch' implementations
-
-This implementation is for Secure Shell (SSH), and attempts to comply with the
-IETF secsh internet draft:
-    http://tools.ietf.org/wg/secsh/draft-ietf-secsh-scp-sftp-ssh-uri/
-
-    Currently does not support the sftp parameters, as this uses scp
-    Also does not support the 'fingerprint' connection parameter.
-
-    Please note that '/' is used as host, path separator not ':' as you may 
-    be used to, also '~' can be used to specify user HOME, but again after '/'
-    
-    Example SRC_URI:
-    SRC_URI = "ssh://user@host.example.com/dir/path/file.txt"
-    SRC_URI = "ssh://user@host.example.com/~/file.txt"
-'''
-
-# Copyright (C) 2006  OpenedHand Ltd.
-#
-#
-# Based in part on svk.py:
-#    Copyright (C) 2006 Holger Hans Peter Freyther
-#    Based on svn.py:
-#        Copyright (C) 2003, 2004  Chris Larson
-#        Based on functions from the base bb module:
-#            Copyright 2003 Holger Schurig
-#
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import re, os
-from   bb import data
-from   bb.fetch2 import FetchMethod
-from   bb.fetch2 import FetchError
-from   bb.fetch2 import logger
-from   bb.fetch2 import runfetchcmd
-
-
-__pattern__ = re.compile(r'''
- \s*                 # Skip leading whitespace
- ssh://              # scheme
- (                   # Optional username/password block
-  (?P<user>\S+)      # username
-  (:(?P<pass>\S+))?  # colon followed by the password (optional)
- )?
- (?P<cparam>(;[^;]+)*)?  # connection parameters block (optional)
- @
- (?P<host>\S+?)          # non-greedy match of the host
- (:(?P<port>[0-9]+))?    # colon followed by the port (optional)
- /
- (?P<path>[^;]+)         # path on the remote system, may be absolute or relative,
-                         # and may include the use of '~' to reference the remote home
-                         # directory
- (?P<sparam>(;[^;]+)*)?  # parameters block (optional)
- $
-''', re.VERBOSE)
-
-class SSH(FetchMethod):
-    '''Class to fetch a module or modules via Secure Shell'''
-
-    def supports(self, urldata, d):
-        return __pattern__.match(urldata.url) != None
-
-    def supports_checksum(self, urldata):
-        return False
-
-    def urldata_init(self, urldata, d):
-        if 'protocol' in urldata.parm and urldata.parm['protocol'] == 'git':
-            raise bb.fetch2.ParameterError(
-                "Invalid protocol - if you wish to fetch from a git " +
-                "repository using ssh, you need to use " +
-                "git:// prefix with protocol=ssh", urldata.url)
-        m = __pattern__.match(urldata.url)
-        path = m.group('path')
-        host = m.group('host')
-        urldata.localpath = os.path.join(d.getVar('DL_DIR', True), os.path.basename(path))
-
-    def download(self, urldata, d):
-        dldir = d.getVar('DL_DIR', True)
-
-        m = __pattern__.match(urldata.url)
-        path = m.group('path')
-        host = m.group('host')
-        port = m.group('port')
-        user = m.group('user')
-        password = m.group('pass')
-
-        if port:
-            portarg = '-P %s' % port
-        else:
-            portarg = ''
-
-        if user:
-            fr = user
-            if password:
-                fr += ':%s' % password
-            fr += '@%s' % host
-        else:
-            fr = host
-        fr += ':%s' % path
-
-
-        import commands
-        cmd = 'scp -B -r %s %s %s/' % (
-            portarg,
-            commands.mkarg(fr),
-            commands.mkarg(dldir)
-        )
-
-        bb.fetch2.check_network_access(d, cmd, urldata.url)
-
-        runfetchcmd(cmd, d)
-

bitbake/lib/bb/fetch2/svk.py

@@ -1,97 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-"""
-BitBake 'Fetch' implementations
-
-This implementation is for svk. It is based on the svn implementation
-
-"""
-
-# Copyright (C) 2006 Holger Hans Peter Freyther
-# Copyright (C) 2003, 2004  Chris Larson
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Based on functions from the base bb module, Copyright 2003 Holger Schurig
-
-import os
-import logging
-import bb
-from   bb import data
-from   bb.fetch2 import FetchMethod
-from   bb.fetch2 import FetchError
-from   bb.fetch2 import MissingParameterError
-from   bb.fetch2 import logger
-from   bb.fetch2 import runfetchcmd
-
-class Svk(FetchMethod):
-    """Class to fetch a module or modules from svk repositories"""
-    def supports(self, ud, d):
-        """
-        Check to see if a given url can be fetched with svk.
-        """
-        return ud.type in ['svk']
-
-    def urldata_init(self, ud, d):
-
-        if not "module" in ud.parm:
-            raise MissingParameterError('module', ud.url)
-        else:
-            ud.module = ud.parm["module"]
-
-        ud.revision = ud.parm.get('rev', "")
-
-        ud.localfile = data.expand('%s_%s_%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision, ud.date), d)
-
-    def need_update(self, ud, d):
-        if ud.date == "now":
-            return True
-        if not os.path.exists(ud.localpath):
-            return True
-        return False
-
-    def download(self, ud, d):
-        """Fetch urls"""
-
-        svkroot = ud.host + ud.path
-
-        svkcmd = "svk co -r {%s} %s/%s" % (ud.date, svkroot, ud.module)
-
-        if ud.revision:
-            svkcmd = "svk co -r %s %s/%s" % (ud.revision, svkroot, ud.module)
-
-        # create temp directory
-        localdata = data.createCopy(d)
-        data.update_data(localdata)
-        logger.debug(2, "Fetch: creating temporary directory")
-        bb.utils.mkdirhier(data.expand('${WORKDIR}', localdata))
-        data.setVar('TMPBASE', data.expand('${WORKDIR}/oesvk.XXXXXX', localdata), localdata)
-        tmpfile, errors = bb.process.run(data.getVar('MKTEMPDIRCMD', localdata, True) or "false")
-        tmpfile = tmpfile.strip()
-        if not tmpfile:
-            logger.error()
-            raise FetchError("Fetch: unable to create temporary directory.. make sure 'mktemp' is in the PATH.", ud.url)
-
-        # check out sources there
-        os.chdir(tmpfile)
-        logger.info("Fetch " + ud.url)
-        logger.debug(1, "Running %s", svkcmd)
-        runfetchcmd(svkcmd, d, cleanup = [tmpfile])
-
-        os.chdir(os.path.join(tmpfile, os.path.dirname(ud.module)))
-        # tar them up to a defined filename
-        runfetchcmd("tar -czf %s %s" % (ud.localpath, os.path.basename(ud.module)), d, cleanup = [ud.localpath])
-
-        # cleanup
-        bb.utils.prunedir(tmpfile)

bitbake/lib/bb/fetch2/svn.py

@@ -1,191 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-"""
-BitBake 'Fetch' implementation for svn.
-
-"""
-
-# Copyright (C) 2003, 2004  Chris Larson
-# Copyright (C) 2004        Marcin Juszkiewicz
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Based on functions from the base bb module, Copyright 2003 Holger Schurig
-
-import os
-import sys
-import logging
-import bb
-import re
-from   bb import data
-from   bb.fetch2 import FetchMethod
-from   bb.fetch2 import FetchError
-from   bb.fetch2 import MissingParameterError
-from   bb.fetch2 import runfetchcmd
-from   bb.fetch2 import logger
-
-class Svn(FetchMethod):
-    """Class to fetch a module or modules from svn repositories"""
-    def supports(self, ud, d):
-        """
-        Check to see if a given url can be fetched with svn.
-        """
-        return ud.type in ['svn']
-
-    def urldata_init(self, ud, d):
-        """
-        init svn specific variable within url data
-        """
-        if not "module" in ud.parm:
-            raise MissingParameterError('module', ud.url)
-
-        ud.basecmd = d.getVar('FETCHCMD_svn', True)
-
-        ud.module = ud.parm["module"]
-
-        # Create paths to svn checkouts
-        relpath = self._strip_leading_slashes(ud.path)
-        ud.pkgdir = os.path.join(data.expand('${SVNDIR}', d), ud.host, relpath)
-        ud.moddir = os.path.join(ud.pkgdir, ud.module)
-
-        ud.setup_revisons(d)
-
-        if 'rev' in ud.parm:
-            ud.revision = ud.parm['rev']
-
-        ud.localfile = data.expand('%s_%s_%s_%s_.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision), d)
-
-    def _buildsvncommand(self, ud, d, command):
-        """
-        Build up an svn commandline based on ud
-        command is "fetch", "update", "info"
-        """
-
-        proto = ud.parm.get('protocol', 'svn')
-
-        svn_rsh = None
-        if proto == "svn+ssh" and "rsh" in ud.parm:
-            svn_rsh = ud.parm["rsh"]
-
-        svnroot = ud.host + ud.path
-
-        options = []
-
-        options.append("--no-auth-cache")
-
-        if ud.user:
-            options.append("--username %s" % ud.user)
-
-        if ud.pswd:
-            options.append("--password %s" % ud.pswd)
-
-        if command == "info":
-            svncmd = "%s info %s %s://%s/%s/" % (ud.basecmd, " ".join(options), proto, svnroot, ud.module)
-        elif command == "log1":
-            svncmd = "%s log --limit 1 %s %s://%s/%s/" % (ud.basecmd, " ".join(options), proto, svnroot, ud.module)
-        else:
-            suffix = ""
-            if ud.revision:
-                options.append("-r %s" % ud.revision)
-                suffix = "@%s" % (ud.revision)
-
-            if command == "fetch":
-                svncmd = "%s co %s %s://%s/%s%s %s" % (ud.basecmd, " ".join(options), proto, svnroot, ud.module, suffix, ud.module)
-            elif command == "update":
-                svncmd = "%s update %s" % (ud.basecmd, " ".join(options))
-            else:
-                raise FetchError("Invalid svn command %s" % command, ud.url)
-
-        if svn_rsh:
-            svncmd = "svn_RSH=\"%s\" %s" % (svn_rsh, svncmd)
-
-        return svncmd
-
-    def download(self, ud, d):
-        """Fetch url"""
-
-        logger.debug(2, "Fetch: checking for module directory '" + ud.moddir + "'")
-
-        if os.access(os.path.join(ud.moddir, '.svn'), os.R_OK):
-            svnupdatecmd = self._buildsvncommand(ud, d, "update")
-            logger.info("Update " + ud.url)
-            # update sources there
-            os.chdir(ud.moddir)
-            # We need to attempt to run svn upgrade first in case its an older working format
-            try:
-                runfetchcmd(ud.basecmd + " upgrade", d)
-            except FetchError:
-                pass
-            logger.debug(1, "Running %s", svnupdatecmd)
-            bb.fetch2.check_network_access(d, svnupdatecmd, ud.url)
-            runfetchcmd(svnupdatecmd, d)
-        else:
-            svnfetchcmd = self._buildsvncommand(ud, d, "fetch")
-            logger.info("Fetch " + ud.url)
-            # check out sources there
-            bb.utils.mkdirhier(ud.pkgdir)
-            os.chdir(ud.pkgdir)
-            logger.debug(1, "Running %s", svnfetchcmd)
-            bb.fetch2.check_network_access(d, svnfetchcmd, ud.url)
-            runfetchcmd(svnfetchcmd, d)
-
-        scmdata = ud.parm.get("scmdata", "")
-        if scmdata == "keep":
-            tar_flags = ""
-        else:
-            tar_flags = "--exclude '.svn'"
-
-        os.chdir(ud.pkgdir)
-        # tar them up to a defined filename
-        runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, ud.module), d, cleanup = [ud.localpath])
-
-    def clean(self, ud, d):
-        """ Clean SVN specific files and dirs """
-
-        bb.utils.remove(ud.localpath)
-        bb.utils.remove(ud.moddir, True)
-        
-
-    def supports_srcrev(self):
-        return True
-
-    def _revision_key(self, ud, d, name):
-        """
-        Return a unique key for the url
-        """
-        return "svn:" + ud.moddir
-
-    def _latest_revision(self, ud, d, name):
-        """
-        Return the latest upstream revision number
-        """
-        bb.fetch2.check_network_access(d, self._buildsvncommand(ud, d, "log1"))
-
-        output = runfetchcmd("LANG=C LC_ALL=C " + self._buildsvncommand(ud, d, "log1"), d, True)
-
-        # skip the first line, as per output of svn log
-        # then we expect the revision on the 2nd line
-        revision = re.search('^r([0-9]*)', output.splitlines()[1]).group(1)
-
-        return revision
-
-    def sortable_revision(self, ud, d, name):
-        """
-        Return a sortable revision number which in our case is the revision number
-        """
-
-        return False, self._build_revision(ud, d)
-
-    def _build_revision(self, ud, d):
-        return ud.revision

bitbake/lib/bb/fetch2/wget.py

@@ -1,101 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-"""
-BitBake 'Fetch' implementations
-
-Classes for obtaining upstream sources for the
-BitBake build tools.
-
-"""
-
-# Copyright (C) 2003, 2004  Chris Larson
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Based on functions from the base bb module, Copyright 2003 Holger Schurig
-
-import os
-import logging
-import bb
-import urllib
-from   bb import data
-from   bb.fetch2 import FetchMethod
-from   bb.fetch2 import FetchError
-from   bb.fetch2 import logger
-from   bb.fetch2 import runfetchcmd
-
-class Wget(FetchMethod):
-    """Class to fetch urls via 'wget'"""
-    def supports(self, ud, d):
-        """
-        Check to see if a given url can be fetched with wget.
-        """
-        return ud.type in ['http', 'https', 'ftp']
-
-    def recommends_checksum(self, urldata):
-        return True
-
-    def urldata_init(self, ud, d):
-        if 'protocol' in ud.parm:
-            if ud.parm['protocol'] == 'git':
-                raise bb.fetch2.ParameterError("Invalid protocol - if you wish to fetch from a git repository using http, you need to instead use the git:// prefix with protocol=http", ud.url)
-
-        if 'downloadfilename' in ud.parm:
-            ud.basename = ud.parm['downloadfilename']
-        else:
-            ud.basename = os.path.basename(ud.path)
-
-        ud.localfile = data.expand(urllib.unquote(ud.basename), d)
-
-    def download(self, ud, d, checkonly = False):
-        """Fetch urls"""
-
-        basecmd = d.getVar("FETCHCMD_wget", True) or "/usr/bin/env wget -t 2 -T 30 -nv --passive-ftp --no-check-certificate"
-
-        if not checkonly and 'downloadfilename' in ud.parm:
-            dldir = d.getVar("DL_DIR", True)
-            bb.utils.mkdirhier(os.path.dirname(dldir + os.sep + ud.localfile))
-            basecmd += " -O " + dldir + os.sep + ud.localfile
-
-        if checkonly:
-            fetchcmd = d.getVar("CHECKCOMMAND_wget", True) or d.expand(basecmd + " --spider '${URI}'")
-        elif os.path.exists(ud.localpath):
-            # file exists, but we didnt complete it.. trying again..
-            fetchcmd = d.getVar("RESUMECOMMAND_wget", True) or d.expand(basecmd + " -c -P ${DL_DIR} '${URI}'")
-        else:
-            fetchcmd = d.getVar("FETCHCOMMAND_wget", True) or d.expand(basecmd + " -P ${DL_DIR} '${URI}'")
-
-        uri = ud.url.split(";")[0]
-
-        fetchcmd = fetchcmd.replace("${URI}", uri.split(";")[0])
-        fetchcmd = fetchcmd.replace("${FILE}", ud.basename)
-        if not checkonly:
-            logger.info("fetch " + uri)
-            logger.debug(2, "executing " + fetchcmd)
-        bb.fetch2.check_network_access(d, fetchcmd)
-        runfetchcmd(fetchcmd, d, quiet=checkonly)
-
-        # Sanity check since wget can pretend it succeed when it didn't
-        # Also, this used to happen if sourceforge sent us to the mirror page
-        if not os.path.exists(ud.localpath) and not checkonly:
-            raise FetchError("The fetch command returned success for url %s but %s doesn't exist?!" % (uri, ud.localpath), uri)
-
-        if not checkonly and os.path.getsize(ud.localpath) == 0:
-            os.remove(ud.localpath)
-            raise FetchError("The fetch of %s resulted in a zero size file?! Deleting and failing since this isn't right." % (uri), uri)
-
-        return True
-
-    def checkstatus(self, ud, d):
-        return self.download(ud, d, True)

bitbake/lib/bb/manifest.py

@@ -0,0 +1,144 @@
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+#
+# Copyright (C) 2003, 2004  Chris Larson
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import os, sys
+import bb, bb.data
+
+def getfields(line):
+    fields = {}
+    fieldmap = ( "pkg", "src", "dest", "type", "mode", "uid", "gid", "major", "minor", "start", "inc", "count" )
+    for f in xrange(len(fieldmap)):
+        fields[fieldmap[f]] = None
+
+    if not line:
+        return None
+
+    splitline = line.split()
+    if not len(splitline):
+        return None
+
+    try:
+        for f in xrange(len(fieldmap)):
+            if splitline[f] == '-':
+                continue
+            fields[fieldmap[f]] = splitline[f]
+    except IndexError:
+        pass
+    return fields
+
+def parse (mfile, d):
+    manifest = []
+    while 1:
+        line = mfile.readline()
+        if not line:
+            break
+        if line.startswith("#"):
+            continue
+        fields = getfields(line)
+        if not fields:
+            continue
+        manifest.append(fields)
+    return manifest
+
+def emit (func, manifest, d):
+#str = "%s () {\n" % func
+    str = ""
+    for line in manifest:
+        emittedline = emit_line(func, line, d)
+        if not emittedline:
+            continue
+        str += emittedline + "\n"
+#       str += "}\n"
+    return str
+
+def mangle (func, line, d):
+    import copy
+    newline = copy.copy(line)
+    src = bb.data.expand(newline["src"], d)
+
+    if src:
+        if not os.path.isabs(src):
+            src = "${WORKDIR}/" + src
+
+    dest = newline["dest"]
+    if not dest:
+        return
+
+    if dest.startswith("/"):
+        dest = dest[1:]
+
+    if func is "do_install":
+        dest = "${D}/" + dest
+
+    elif func is "do_populate":
+        dest = "${WORKDIR}/install/" + newline["pkg"] + "/" + dest
+
+    elif func is "do_stage":
+        varmap = {}
+        varmap["${bindir}"] = "${STAGING_DIR}/${HOST_SYS}/bin"
+        varmap["${libdir}"] = "${STAGING_DIR}/${HOST_SYS}/lib"
+        varmap["${includedir}"] = "${STAGING_DIR}/${HOST_SYS}/include"
+        varmap["${datadir}"] = "${STAGING_DATADIR}"
+
+        matched = 0
+        for key in varmap.keys():
+            if dest.startswith(key):
+                dest = varmap[key] + "/" + dest[len(key):]
+                matched = 1
+        if not matched:
+            newline = None
+            return
+    else:
+        newline = None
+        return
+
+    newline["src"] = src
+    newline["dest"] = dest
+    return newline
+
+def emit_line (func, line, d):
+    import copy
+    newline = copy.deepcopy(line)
+    newline = mangle(func, newline, d)
+    if not newline:
+        return None
+
+    str = ""
+    type = newline["type"]
+    mode = newline["mode"]
+    src = newline["src"]
+    dest = newline["dest"]
+    if type is "d":
+        str = "install -d "
+        if mode:
+            str += "-m %s " % mode
+        str += dest
+    elif type is "f":
+        if not src:
+            return None
+        if dest.endswith("/"):
+            str = "install -d "
+            str += dest + "\n"
+            str += "install "
+        else:
+            str = "install -D "
+        if mode:
+            str += "-m %s " % mode
+        str += src + " " + dest
+    del newline
+    return str

bitbake/lib/bb/methodpool.py

@@ -17,13 +17,68 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+
+"""
+    What is a method pool?
+
+    BitBake has a global method scope where .bb, .inc and .bbclass
+    files can install methods. These methods are parsed from strings.
+    To avoid recompiling and executing these string we introduce
+    a method pool to do this task.
+
+    This pool will be used to compile and execute the functions. It
+    will be smart enough to 
+"""
+
 from bb.utils import better_compile, better_exec
+from bb       import error
+
+# A dict of modules we have handled
+# it is the number of .bbclasses + x in size
+_parsed_methods = { }
+_parsed_fns     = { }
 
 def insert_method(modulename, code, fn):
     """
     Add code of a module should be added. The methods
     will be simply added, no checking will be done
     """
-    comp = better_compile(code, modulename, fn )
-    better_exec(comp, None, code, fn)
+    comp = better_compile(code, "<bb>", fn )
+    better_exec(comp, __builtins__, code, fn)
 
+    # now some instrumentation
+    code = comp.co_names
+    for name in code:
+        if name in ['None', 'False']:
+            continue
+        elif name in _parsed_fns and not _parsed_fns[name] == modulename:
+            error( "Error Method already seen: %s in' %s' now in '%s'" % (name, _parsed_fns[name], modulename))
+        else:
+            _parsed_fns[name] = modulename
+
+def check_insert_method(modulename, code, fn):
+    """
+    Add the code if it wasnt added before. The module
+    name will be used for that 
+
+    Variables:
+        @modulename a short name e.g. base.bbclass
+        @code The actual python code
+        @fn   The filename from the outer file
+    """
+    if not modulename in _parsed_methods:
+        return insert_method(modulename, code, fn)
+    _parsed_methods[modulename] = 1
+
+def parsed_module(modulename):
+    """
+    Inform me file xyz was parsed
+    """
+    return modulename in _parsed_methods
+
+
+def get_parsed_dict():
+    """
+    shortcut
+    """
+    return _parsed_methods    

bitbake/lib/bb/monitordisk.py

@@ -1,265 +0,0 @@
-#!/usr/bin/env python
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-#
-# Copyright (C) 2012 Robert Yang
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import os, logging, re, sys
-import bb
-logger = logging.getLogger("BitBake.Monitor")
-
-def printErr(info):
-    logger.error("%s\n       Disk space monitor will NOT be enabled" % info)
-
-def convertGMK(unit):
-
-    """ Convert the space unit G, M, K, the unit is case-insensitive """
-
-    unitG = re.match('([1-9][0-9]*)[gG]\s?$', unit)
-    if unitG:
-        return int(unitG.group(1)) * (1024 ** 3)
-    unitM = re.match('([1-9][0-9]*)[mM]\s?$', unit)
-    if unitM:
-        return int(unitM.group(1)) * (1024 ** 2)
-    unitK = re.match('([1-9][0-9]*)[kK]\s?$', unit)
-    if unitK:
-        return int(unitK.group(1)) * 1024
-    unitN = re.match('([1-9][0-9]*)\s?$', unit)
-    if unitN:
-        return int(unitN.group(1))
-    else:
-        return None
-
-def getMountedDev(path):
-
-    """ Get the device mounted at the path, uses /proc/mounts """
-
-    # Get the mount point of the filesystem containing path
-    # st_dev is the ID of device containing file
-    parentDev = os.stat(path).st_dev
-    currentDev = parentDev
-    # When the current directory's device is different from the
-    # parrent's, then the current directory is a mount point
-    while parentDev == currentDev:
-        mountPoint = path
-        # Use dirname to get the parrent's directory
-        path = os.path.dirname(path)
-        # Reach the "/"
-        if path == mountPoint:
-            break
-        parentDev= os.stat(path).st_dev
-
-    try:
-        with open("/proc/mounts", "r") as ifp:
-            for line in ifp:
-                procLines = line.rstrip('\n').split()
-                if procLines[1] == mountPoint:
-                    return procLines[0]
-    except EnvironmentError:
-        pass
-    return None
-
-def getDiskData(BBDirs, configuration):
-
-    """Prepare disk data for disk space monitor"""
-
-    # Save the device IDs, need the ID to be unique (the dictionary's key is
-    # unique), so that when more than one directories are located in the same
-    # device, we just monitor it once
-    devDict = {}
-    for pathSpaceInode in BBDirs.split():
-        # The input format is: "dir,space,inode", dir is a must, space
-        # and inode are optional
-        pathSpaceInodeRe = re.match('([^,]*),([^,]*),([^,]*),?(.*)', pathSpaceInode)
-        if not pathSpaceInodeRe:
-            printErr("Invalid value in BB_DISKMON_DIRS: %s" % pathSpaceInode)
-            return None
-
-        action = pathSpaceInodeRe.group(1)
-        if action not in ("ABORT", "STOPTASKS", "WARN"):
-            printErr("Unknown disk space monitor action: %s" % action)
-            return None
-
-        path = os.path.realpath(pathSpaceInodeRe.group(2))
-        if not path:
-            printErr("Invalid path value in BB_DISKMON_DIRS: %s" % pathSpaceInode)
-            return None
-
-        # The disk space or inode is optional, but it should have a correct
-        # value once it is specified
-        minSpace = pathSpaceInodeRe.group(3)
-        if minSpace:
-            minSpace = convertGMK(minSpace)
-            if not minSpace:
-                printErr("Invalid disk space value in BB_DISKMON_DIRS: %s" % pathSpaceInodeRe.group(3))
-                return None
-        else:
-            # None means that it is not specified
-            minSpace = None
-
-        minInode = pathSpaceInodeRe.group(4)
-        if minInode:
-            minInode = convertGMK(minInode)
-            if not minInode:
-                printErr("Invalid inode value in BB_DISKMON_DIRS: %s" % pathSpaceInodeRe.group(4))
-                return None
-        else:
-            # None means that it is not specified
-            minInode = None
-
-        if minSpace is None and minInode is None:
-            printErr("No disk space or inode value in found BB_DISKMON_DIRS: %s" % pathSpaceInode)
-            return None
-        # mkdir for the directory since it may not exist, for example the
-        # DL_DIR may not exist at the very beginning
-        if not os.path.exists(path):
-            bb.utils.mkdirhier(path)
-        dev = getMountedDev(path)
-        # Use path/action as the key
-        devDict[os.path.join(path, action)] = [dev, minSpace, minInode]
-
-    return devDict
-
-def getInterval(configuration):
-
-    """ Get the disk space interval """
-
-    # The default value is 50M and 5K.
-    spaceDefault = 50 * 1024 * 1024
-    inodeDefault = 5 * 1024
-
-    interval = configuration.getVar("BB_DISKMON_WARNINTERVAL", True)
-    if not interval:
-        return spaceDefault, inodeDefault
-    else:
-        # The disk space or inode interval is optional, but it should
-        # have a correct value once it is specified
-        intervalRe = re.match('([^,]*),?\s*(.*)', interval)
-        if intervalRe:
-            intervalSpace = intervalRe.group(1)
-            if intervalSpace:
-                intervalSpace = convertGMK(intervalSpace)
-                if not intervalSpace:
-                    printErr("Invalid disk space interval value in BB_DISKMON_WARNINTERVAL: %s" % intervalRe.group(1))
-                    return None, None
-            else:
-                intervalSpace = spaceDefault
-            intervalInode = intervalRe.group(2)
-            if intervalInode:
-                intervalInode = convertGMK(intervalInode)
-                if not intervalInode:
-                    printErr("Invalid disk inode interval value in BB_DISKMON_WARNINTERVAL: %s" % intervalRe.group(2))
-                    return None, None
-            else:
-                intervalInode = inodeDefault
-            return intervalSpace, intervalInode
-        else:
-            printErr("Invalid interval value in BB_DISKMON_WARNINTERVAL: %s" % interval)
-            return None, None
-
-class diskMonitor:
-
-    """Prepare the disk space monitor data"""
-
-    def __init__(self, configuration):
-
-        self.enableMonitor = False
-        self.configuration = configuration
-
-        BBDirs = configuration.getVar("BB_DISKMON_DIRS", True) or None
-        if BBDirs:
-            self.devDict = getDiskData(BBDirs, configuration)
-            if self.devDict:
-                self.spaceInterval, self.inodeInterval = getInterval(configuration)
-                if self.spaceInterval and self.inodeInterval:
-                    self.enableMonitor = True
-                    # These are for saving the previous disk free space and inode, we
-                    # use them to avoid print too many warning messages
-                    self.preFreeS = {}
-                    self.preFreeI = {}
-                    # This is for STOPTASKS and ABORT, to avoid print the message repeatly
-                    # during waiting the tasks to finish
-                    self.checked = {}
-                    for k in self.devDict:
-                        self.preFreeS[k] = 0
-                        self.preFreeI[k] = 0
-                        self.checked[k] = False
-                    if self.spaceInterval is None and self.inodeInterval is None:
-                        self.enableMonitor = False
-
-    def check(self, rq):
-
-        """ Take action for the monitor """
-
-        if self.enableMonitor:
-            for k in self.devDict:
-                path = os.path.dirname(k)
-                action = os.path.basename(k)
-                dev = self.devDict[k][0]
-                minSpace = self.devDict[k][1]
-                minInode = self.devDict[k][2]
-
-                st = os.statvfs(path)
-
-                # The free space, float point number
-                freeSpace = st.f_bavail * st.f_frsize
-
-                if minSpace and freeSpace < minSpace:
-                    # Always show warning, the self.checked would always be False if the action is WARN
-                    if self.preFreeS[k] == 0 or self.preFreeS[k] - freeSpace > self.spaceInterval and not self.checked[k]:
-                        logger.warn("The free space of %s (%s) is running low (%.3fGB left)" % \
-                                (path, dev, freeSpace / 1024 / 1024 / 1024.0))
-                        self.preFreeS[k] = freeSpace
-
-                    if action == "STOPTASKS" and not self.checked[k]:
-                        logger.error("No new tasks can be executed since the disk space monitor action is \"STOPTASKS\"!")
-                        self.checked[k] = True
-                        rq.finish_runqueue(False)
-                        bb.event.fire(bb.event.DiskFull(dev, 'disk', freeSpace, path), self.configuration)
-                    elif action == "ABORT" and not self.checked[k]:
-                        logger.error("Immediately abort since the disk space monitor action is \"ABORT\"!")
-                        self.checked[k] = True
-                        rq.finish_runqueue(True)
-                        bb.event.fire(bb.event.DiskFull(dev, 'disk', freeSpace, path), self.configuration)
-
-                # The free inodes, float point number
-                freeInode = st.f_favail
-
-                if minInode and freeInode < minInode:
-                    # Some fs formats' (e.g., btrfs) statvfs.f_files (inodes) is
-                    # zero, this is a feature of the fs, we disable the inode
-                    # checking for such a fs.
-                    if st.f_files == 0:
-                        logger.info("Inode check for %s is unavaliable, will remove it from disk monitor" % path)
-                        self.devDict[k][2] = None
-                        continue
-                    # Always show warning, the self.checked would always be False if the action is WARN
-                    if self.preFreeI[k] == 0 or self.preFreeI[k] - freeInode > self.inodeInterval and not self.checked[k]:
-                        logger.warn("The free inode of %s (%s) is running low (%.3fK left)" % \
-                                (path, dev, freeInode / 1024.0))
-                        self.preFreeI[k] = freeInode
-
-                    if action  == "STOPTASKS" and not self.checked[k]:
-                        logger.error("No new tasks can be executed since the disk space monitor action is \"STOPTASKS\"!")
-                        self.checked[k] = True
-                        rq.finish_runqueue(False)
-                        bb.event.fire(bb.event.DiskFull(dev, 'inode', freeInode, path), self.configuration)
-                    elif action  == "ABORT" and not self.checked[k]:
-                        logger.error("Immediately abort since the disk space monitor action is \"ABORT\"!")
-                        self.checked[k] = True
-                        rq.finish_runqueue(True)
-                        bb.event.fire(bb.event.DiskFull(dev, 'inode', freeInode, path), self.configuration)
-        return

bitbake/lib/bb/msg.py

@@ -22,161 +22,108 @@ Message handling infrastructure for bitbake
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-import sys
-import copy
-import logging
-import collections
-from itertools import groupby
-import warnings
-import bb
-import bb.event
+import sys, os, re, bb
+from bb import utils, event
 
-class BBLogFormatter(logging.Formatter):
-    """Formatter which ensures that our 'plain' messages (logging.INFO + 1) are used as is"""
+debug_level = {}
 
-    DEBUG3 = logging.DEBUG - 2
-    DEBUG2 = logging.DEBUG - 1
-    DEBUG = logging.DEBUG
-    VERBOSE = logging.INFO - 1
-    NOTE = logging.INFO
-    PLAIN = logging.INFO + 1
-    ERROR = logging.ERROR
-    WARNING = logging.WARNING
-    CRITICAL = logging.CRITICAL
+verbose = False
 
-    levelnames = {
-        DEBUG3   : 'DEBUG',
-        DEBUG2   : 'DEBUG',
-        DEBUG   : 'DEBUG',
-        VERBOSE: 'NOTE',
-        NOTE    : 'NOTE',
-        PLAIN  : '',
-        WARNING : 'WARNING',
-        ERROR   : 'ERROR',
-        CRITICAL: 'ERROR',
-    }
-
-    color_enabled = False
-    BASECOLOR, BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(29,38)
-
-    COLORS = {
-        DEBUG3  : CYAN,
-        DEBUG2  : CYAN,
-        DEBUG   : CYAN,
-        VERBOSE : BASECOLOR,
-        NOTE    : BASECOLOR,
-        PLAIN   : BASECOLOR,
-        WARNING : YELLOW,
-        ERROR   : RED,
-        CRITICAL: RED,
-    }
-
-    BLD = '\033[1;%dm'
-    STD = '\033[%dm'
-    RST = '\033[0m'
-
-    def getLevelName(self, levelno):
-        try:
-            return self.levelnames[levelno]
-        except KeyError:
-            self.levelnames[levelno] = value = 'Level %d' % levelno
-            return value
-
-    def format(self, record):
-        record.levelname = self.getLevelName(record.levelno)
-        if record.levelno == self.PLAIN:
-            msg = record.getMessage()
-        else:
-            if self.color_enabled:
-                record = self.colorize(record)
-            msg = logging.Formatter.format(self, record)
-
-        if hasattr(record, 'bb_exc_info'):
-            etype, value, tb = record.bb_exc_info
-            formatted = bb.exceptions.format_exception(etype, value, tb, limit=5)
-            msg += '\n' + ''.join(formatted)
-        return msg
-
-    def colorize(self, record):
-        color = self.COLORS[record.levelno]
-        if self.color_enabled and color is not None:
-            record = copy.copy(record)
-            record.levelname = "".join([self.BLD % color, record.levelname, self.RST])
-            record.msg = "".join([self.STD % color, record.msg, self.RST])
-        return record
-
-    def enable_color(self):
-        self.color_enabled = True
-
-class BBLogFilter(object):
-    def __init__(self, handler, level, debug_domains):
-        self.stdlevel = level
-        self.debug_domains = debug_domains
-        loglevel = level
-        for domain in debug_domains:
-            if debug_domains[domain] < loglevel:
-                loglevel = debug_domains[domain]
-        handler.setLevel(loglevel)
-        handler.addFilter(self)
-
-    def filter(self, record):
-        if record.levelno >= self.stdlevel:
-            return True
-        if record.name in self.debug_domains and record.levelno >= self.debug_domains[record.name]:
-            return True
-        return False
+domain = bb.utils.Enum(
+    'Build',
+    'Cache',
+    'Collection',
+    'Data',
+    'Depends',
+    'Fetcher',
+    'Parsing',
+    'PersistData',
+    'Provider',
+    'RunQueue',
+    'TaskData',
+    'Util')
 
 
+class MsgBase(bb.event.Event):
+    """Base class for messages"""
 
+    def __init__(self, msg, d ):
+        self._message = msg
+        event.Event.__init__(self, d)
+
+class MsgDebug(MsgBase):
+    """Debug Message"""
+
+class MsgNote(MsgBase):
+    """Note Message"""
+
+class MsgWarn(MsgBase):
+    """Warning Message"""
+
+class MsgError(MsgBase):
+    """Error Message"""
+
+class MsgFatal(MsgBase):
+    """Fatal Message"""
+
+class MsgPlain(MsgBase):
+    """General output"""
+
+#
 # Message control functions
 #
 
-loggerDefaultDebugLevel = 0
-loggerDefaultVerbose = False
-loggerVerboseLogs = False
-loggerDefaultDomains = []
+def set_debug_level(level):
+    bb.msg.debug_level = {}
+    for domain in bb.msg.domain:
+        bb.msg.debug_level[domain] = level
+    bb.msg.debug_level['default'] = level
 
-def init_msgconfig(verbose, debug, debug_domains = []):
-    """
-    Set default verbosity and debug levels config the logger
-    """
-    bb.msg.loggerDefaultDebugLevel = debug
-    bb.msg.loggerDefaultVerbose = verbose
-    if verbose:
-        bb.msg.loggerVerboseLogs = True
-    bb.msg.loggerDefaultDomains = debug_domains
+def set_verbose(level):
+    bb.msg.verbose = level
 
-def constructLogOptions():
-    debug = loggerDefaultDebugLevel
-    verbose = loggerDefaultVerbose
-    domains = loggerDefaultDomains
-
-    if debug:
-        level = BBLogFormatter.DEBUG - debug + 1
-    elif verbose:
-        level = BBLogFormatter.VERBOSE
-    else:
-        level = BBLogFormatter.NOTE
-
-    debug_domains = {}
-    for (domainarg, iterator) in groupby(domains):
-        dlevel = len(tuple(iterator))
-        debug_domains["BitBake.%s" % domainarg] = logging.DEBUG - dlevel + 1
-    return level, debug_domains
-
-def addDefaultlogFilter(handler):
-    level, debug_domains = constructLogOptions()
-
-    BBLogFilter(handler, level, debug_domains)
+def set_debug_domains(domains):
+    for domain in domains:
+        found = False
+        for ddomain in bb.msg.domain:
+            if domain == str(ddomain):
+                bb.msg.debug_level[ddomain] = bb.msg.debug_level[ddomain] + 1
+                found = True
+        if not found:
+            bb.msg.warn(None, "Logging domain %s is not valid, ignoring" % domain)
 
 #
 # Message handling functions
 #
 
-def fatal(msgdomain, msg):
-    if msgdomain:
-        logger = logging.getLogger("BitBake.%s" % msgdomain)
-    else:
-        logger = logging.getLogger("BitBake")
-    logger.critical(msg)
+def debug(level, domain, msg, fn = None):
+    bb.event.fire(MsgDebug(msg, None))
+    if not domain:
+        domain = 'default'
+    if debug_level[domain] >= level:
+        print 'DEBUG: ' + msg
+
+def note(level, domain, msg, fn = None):
+    bb.event.fire(MsgNote(msg, None))
+    if not domain:
+        domain = 'default'
+    if level == 1 or verbose or debug_level[domain] >= 1:
+        print 'NOTE: ' + msg
+
+def warn(domain, msg, fn = None):
+    bb.event.fire(MsgWarn(msg, None))
+    print 'WARNING: ' + msg
+
+def error(domain, msg, fn = None):
+    bb.event.fire(MsgError(msg, None))
+    print 'ERROR: ' + msg
+
+def fatal(domain, msg, fn = None):
+    bb.event.fire(MsgFatal(msg, None))
+    print 'ERROR: ' + msg
     sys.exit(1)
+
+def plain(msg, fn = None):
+    bb.event.fire(MsgPlain(msg, None))
+    print msg
+

bitbake/lib/bb/namedtuple_with_abc.py

@@ -1,255 +0,0 @@
-# http://code.activestate.com/recipes/577629-namedtupleabc-abstract-base-class-mix-in-for-named/
-#!/usr/bin/env python
-# Copyright (c) 2011 Jan Kaliszewski (zuo). Available under the MIT License.
-
-"""
-namedtuple_with_abc.py:
-* named tuple mix-in + ABC (abstract base class) recipe,
-* works under Python 2.6, 2.7 as well as 3.x.
-
-Import this module to patch collections.namedtuple() factory function
--- enriching it with the 'abc' attribute (an abstract base class + mix-in
-for named tuples) and decorating it with a wrapper that registers each
-newly created named tuple as a subclass of namedtuple.abc.
-
-How to import:
-    import collections, namedtuple_with_abc
-or:
-    import namedtuple_with_abc
-    from collections import namedtuple
-    # ^ in this variant you must import namedtuple function
-    #   *after* importing namedtuple_with_abc module
-or simply:
-    from namedtuple_with_abc import namedtuple
-
-Simple usage example:
-    class Credentials(namedtuple.abc):
-        _fields = 'username password'
-        def __str__(self):
-            return ('{0.__class__.__name__}'
-                    '(username={0.username}, password=...)'.format(self))
-    print(Credentials("alice", "Alice's password"))
-
-For more advanced examples -- see below the "if __name__ == '__main__':".
-"""
-
-import collections
-from abc import ABCMeta, abstractproperty
-from functools import wraps
-from sys import version_info
-
-__all__ = ('namedtuple',)
-_namedtuple = collections.namedtuple
-
-
-class _NamedTupleABCMeta(ABCMeta):
-    '''The metaclass for the abstract base class + mix-in for named tuples.'''
-    def __new__(mcls, name, bases, namespace):
-        fields = namespace.get('_fields')
-        for base in bases:
-            if fields is not None:
-                break
-            fields = getattr(base, '_fields', None)
-        if not isinstance(fields, abstractproperty):
-            basetuple = _namedtuple(name, fields)
-            bases = (basetuple,) + bases
-            namespace.pop('_fields', None)
-            namespace.setdefault('__doc__', basetuple.__doc__)
-            namespace.setdefault('__slots__', ())
-        return ABCMeta.__new__(mcls, name, bases, namespace)
-
-
-exec(
-    # Python 2.x metaclass declaration syntax
-    """class _NamedTupleABC(object):
-        '''The abstract base class + mix-in for named tuples.'''
-        __metaclass__ = _NamedTupleABCMeta
-        _fields = abstractproperty()""" if version_info[0] < 3 else
-    # Python 3.x metaclass declaration syntax
-    """class _NamedTupleABC(metaclass=_NamedTupleABCMeta):
-        '''The abstract base class + mix-in for named tuples.'''
-        _fields = abstractproperty()"""
-)
-
-
-_namedtuple.abc = _NamedTupleABC
-#_NamedTupleABC.register(type(version_info))  # (and similar, in the future...)
-
-@wraps(_namedtuple)
-def namedtuple(*args, **kwargs):
-    '''Named tuple factory with namedtuple.abc subclass registration.'''
-    cls = _namedtuple(*args, **kwargs)
-    _NamedTupleABC.register(cls)
-    return cls
-
-collections.namedtuple = namedtuple
-
-
-
-
-if __name__ == '__main__':
-
-    '''Examples and explanations'''
-
-    # Simple usage
-
-    class MyRecord(namedtuple.abc):
-        _fields = 'x y z'  # such form will be transformed into ('x', 'y', 'z')
-        def _my_custom_method(self):
-            return list(self._asdict().items())
-    # (the '_fields' attribute belongs to the named tuple public API anyway)
-
-    rec = MyRecord(1, 2, 3)
-    print(rec)
-    print(rec._my_custom_method())
-    print(rec._replace(y=222))
-    print(rec._replace(y=222)._my_custom_method())
-
-    # Custom abstract classes...
-
-    class MyAbstractRecord(namedtuple.abc):
-        def _my_custom_method(self):
-            return list(self._asdict().items())
-
-    try:
-        MyAbstractRecord()  # (abstract classes cannot be instantiated)
-    except TypeError as exc:
-        print(exc)
-
-    class AnotherAbstractRecord(MyAbstractRecord):
-        def __str__(self):
-            return '<<<{0}>>>'.format(super(AnotherAbstractRecord,
-                                            self).__str__())
-
-    # ...and their non-abstract subclasses
-
-    class MyRecord2(MyAbstractRecord):
-        _fields = 'a, b'
-
-    class MyRecord3(AnotherAbstractRecord):
-        _fields = 'p', 'q', 'r'
-
-    rec2 = MyRecord2('foo', 'bar')
-    print(rec2)
-    print(rec2._my_custom_method())
-    print(rec2._replace(b=222))
-    print(rec2._replace(b=222)._my_custom_method())
-
-    rec3 = MyRecord3('foo', 'bar', 'baz')
-    print(rec3)
-    print(rec3._my_custom_method())
-    print(rec3._replace(q=222))
-    print(rec3._replace(q=222)._my_custom_method())
-
-   # You can also subclass non-abstract ones...
-
-    class MyRecord33(MyRecord3):
-        def __str__(self):
-            return '< {0!r}, ..., {0!r} >'.format(self.p, self.r)
-
-    rec33 = MyRecord33('foo', 'bar', 'baz')
-    print(rec33)
-    print(rec33._my_custom_method())
-    print(rec33._replace(q=222))
-    print(rec33._replace(q=222)._my_custom_method())
-
-    # ...and even override the magic '_fields' attribute again
-
-    class MyRecord345(MyRecord3):
-        _fields = 'e f g h i j k'
-
-    rec345 = MyRecord345(1, 2, 3, 4, 3, 2, 1)
-    print(rec345)
-    print(rec345._my_custom_method())
-    print(rec345._replace(f=222))
-    print(rec345._replace(f=222)._my_custom_method())
-
-    # Mixing-in some other classes is also possible:
-
-    class MyMixIn(object):
-        def method(self):
-            return "MyMixIn.method() called"
-        def _my_custom_method(self):
-            return "MyMixIn._my_custom_method() called"
-        def count(self, item):
-            return "MyMixIn.count({0}) called".format(item)
-        def _asdict(self):  # (cannot override a namedtuple method, see below)
-            return "MyMixIn._asdict() called"
-
-    class MyRecord4(MyRecord33, MyMixIn):  # mix-in on the right
-        _fields = 'j k l x'
-
-    class MyRecord5(MyMixIn, MyRecord33):  # mix-in on the left
-        _fields = 'j k l x y'
-
-    rec4 = MyRecord4(1, 2, 3, 2)
-    print(rec4)
-    print(rec4.method())
-    print(rec4._my_custom_method())  # MyRecord33's
-    print(rec4.count(2))  # tuple's
-    print(rec4._replace(k=222))
-    print(rec4._replace(k=222).method())
-    print(rec4._replace(k=222)._my_custom_method())  # MyRecord33's
-    print(rec4._replace(k=222).count(8))  # tuple's
-
-    rec5 = MyRecord5(1, 2, 3, 2, 1)
-    print(rec5)
-    print(rec5.method())
-    print(rec5._my_custom_method())  # MyMixIn's
-    print(rec5.count(2))  # MyMixIn's
-    print(rec5._replace(k=222))
-    print(rec5._replace(k=222).method())
-    print(rec5._replace(k=222)._my_custom_method())  # MyMixIn's
-    print(rec5._replace(k=222).count(2))  # MyMixIn's
-
-    # None that behavior: the standard namedtuple methods cannot be
-    # overriden by a foreign mix-in -- even if the mix-in is declared
-    # as the leftmost base class (but, obviously, you can override them
-    # in the defined class or its subclasses):
-
-    print(rec4._asdict())  # (returns a dict, not "MyMixIn._asdict() called")
-    print(rec5._asdict())  # (returns a dict, not "MyMixIn._asdict() called")
-
-    class MyRecord6(MyRecord33):
-        _fields = 'j k l x y z'
-        def _asdict(self):
-            return "MyRecord6._asdict() called"
-    rec6 = MyRecord6(1, 2, 3, 1, 2, 3)
-    print(rec6._asdict())  # (this returns "MyRecord6._asdict() called")
-
-    # All that record classes are real subclasses of namedtuple.abc:
-
-    assert issubclass(MyRecord, namedtuple.abc)
-    assert issubclass(MyAbstractRecord, namedtuple.abc)
-    assert issubclass(AnotherAbstractRecord, namedtuple.abc)
-    assert issubclass(MyRecord2, namedtuple.abc)
-    assert issubclass(MyRecord3, namedtuple.abc)
-    assert issubclass(MyRecord33, namedtuple.abc)
-    assert issubclass(MyRecord345, namedtuple.abc)
-    assert issubclass(MyRecord4, namedtuple.abc)
-    assert issubclass(MyRecord5, namedtuple.abc)
-    assert issubclass(MyRecord6, namedtuple.abc)
-
-    # ...but abstract ones are not subclasses of tuple
-    # (and this is what you probably want):
-
-    assert not issubclass(MyAbstractRecord, tuple)
-    assert not issubclass(AnotherAbstractRecord, tuple)
-
-    assert issubclass(MyRecord, tuple)
-    assert issubclass(MyRecord2, tuple)
-    assert issubclass(MyRecord3, tuple)
-    assert issubclass(MyRecord33, tuple)
-    assert issubclass(MyRecord345, tuple)
-    assert issubclass(MyRecord4, tuple)
-    assert issubclass(MyRecord5, tuple)
-    assert issubclass(MyRecord6, tuple)
-
-    # Named tuple classes created with namedtuple() factory function
-    # (in the "traditional" way) are registered as "virtual" subclasses
-    # of namedtuple.abc:
-
-    MyTuple = namedtuple('MyTuple', 'a b c')
-    mt = MyTuple(1, 2, 3)
-    assert issubclass(MyTuple, namedtuple.abc)
-    assert isinstance(mt, namedtuple.abc)

bitbake/lib/bb/parse/__init__.py

@@ -24,66 +24,43 @@ File parsers for the BitBake build tools.
 #
 # Based on functions from the base bb module, Copyright 2003 Holger Schurig
 
+__all__ = [ 'ParseError', 'SkipPackage', 'cached_mtime', 'mark_dependency',
+            'supports', 'handle', 'init' ]
 handlers = []
 
-import os
-import stat
-import logging
-import bb
-import bb.utils
-import bb.siggen
-
-logger = logging.getLogger("BitBake.Parsing")
+import bb, os
 
 class ParseError(Exception):
     """Exception raised when parsing fails"""
-    def __init__(self, msg, filename, lineno=0):
-        self.msg = msg
-        self.filename = filename
-        self.lineno = lineno
-        Exception.__init__(self, msg, filename, lineno)
-
-    def __str__(self):
-        if self.lineno:
-            return "ParseError at %s:%d: %s" % (self.filename, self.lineno, self.msg)
-        else:
-            return "ParseError in %s: %s" % (self.filename, self.msg)
 
 class SkipPackage(Exception):
     """Exception raised to skip this package"""
 
 __mtime_cache = {}
 def cached_mtime(f):
-    if f not in __mtime_cache:
-        __mtime_cache[f] = os.stat(f)[stat.ST_MTIME]
+    if not __mtime_cache.has_key(f):
+        __mtime_cache[f] = os.stat(f)[8]
     return __mtime_cache[f]
 
 def cached_mtime_noerror(f):
-    if f not in __mtime_cache:
+    if not __mtime_cache.has_key(f):
         try:
-            __mtime_cache[f] = os.stat(f)[stat.ST_MTIME]
+            __mtime_cache[f] = os.stat(f)[8]
         except OSError:
             return 0
     return __mtime_cache[f]
 
 def update_mtime(f):
-    __mtime_cache[f] = os.stat(f)[stat.ST_MTIME]
+    __mtime_cache[f] = os.stat(f)[8]
     return __mtime_cache[f]
 
 def mark_dependency(d, f):
     if f.startswith('./'):
         f = "%s/%s" % (os.getcwd(), f[2:])
-    deps = (d.getVar('__depends') or [])
-    s = (f, cached_mtime_noerror(f))
-    if s not in deps:
-        deps.append(s)
-        d.setVar('__depends', deps)
+    deps = bb.data.getVar('__depends', d) or []
+    deps.append( (f, cached_mtime(f)) )
+    bb.data.setVar('__depends', deps, d)
 
-def check_dependency(d, f):
-    s = (f, cached_mtime_noerror(f))
-    deps = (d.getVar('__depends') or [])
-    return s in deps
-   
 def supports(fn, data):
     """Returns true if we have a handler for this file, false otherwise"""
     for h in handlers:
@@ -95,63 +72,13 @@ def handle(fn, data, include = 0):
     """Call the handler that is appropriate for this file"""
     for h in handlers:
         if h['supports'](fn, data):
-            with data.inchistory.include(fn):
-                return h['handle'](fn, data, include)
-    raise ParseError("not a BitBake file", fn)
+            return h['handle'](fn, data, include)
+    raise ParseError("%s is not a BitBake file" % fn)
 
 def init(fn, data):
     for h in handlers:
         if h['supports'](fn):
             return h['init'](data)
 
-def init_parser(d):
-    bb.parse.siggen = bb.siggen.init(d)
 
-def resolve_file(fn, d):
-    if not os.path.isabs(fn):
-        bbpath = d.getVar("BBPATH", True)
-        newfn, attempts = bb.utils.which(bbpath, fn, history=True)
-        for af in attempts:
-            mark_dependency(d, af)
-        if not newfn:
-            raise IOError("file %s not found in %s" % (fn, bbpath))
-        fn = newfn
-
-    mark_dependency(d, fn)
-    if not os.path.isfile(fn):
-        raise IOError("file %s not found" % fn)
-
-    logger.debug(2, "LOAD %s", fn)
-    return fn
-
-# Used by OpenEmbedded metadata
-__pkgsplit_cache__={}
-def vars_from_file(mypkg, d):
-    if not mypkg or not mypkg.endswith((".bb", ".bbappend")):
-        return (None, None, None)
-    if mypkg in __pkgsplit_cache__:
-        return __pkgsplit_cache__[mypkg]
-
-    myfile = os.path.splitext(os.path.basename(mypkg))
-    parts = myfile[0].split('_')
-    __pkgsplit_cache__[mypkg] = parts
-    if len(parts) > 3:
-        raise ParseError("Unable to generate default variables from filename (too many underscores)", mypkg)
-    exp = 3 - len(parts)
-    tmplist = []
-    while exp != 0:
-        exp -= 1
-        tmplist.append(None)
-    parts.extend(tmplist)
-    return parts
-
-def get_file_depends(d):
-    '''Return the dependent files'''
-    dep_files = []
-    depends = d.getVar('__base_depends', True) or []
-    depends = depends + (d.getVar('__depends', True) or [])
-    for (fn, _) in depends:
-        dep_files.append(os.path.abspath(fn))
-    return " ".join(dep_files)
-
-from bb.parse.parse_py import __version__, ConfHandler, BBHandler
+from parse_py import __version__, ConfHandler, BBHandler

bitbake/lib/bb/parse/ast.py

@@ -1,476 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-"""
- AbstractSyntaxTree classes for the Bitbake language
-"""
-
-# Copyright (C) 2003, 2004 Chris Larson
-# Copyright (C) 2003, 2004 Phil Blundell
-# Copyright (C) 2009 Holger Hans Peter Freyther
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-from __future__ import absolute_import
-from future_builtins import filter
-import re
-import string
-import logging
-import bb
-import itertools
-from bb import methodpool
-from bb.parse import logger
-
-_bbversions_re = re.compile(r"\[(?P<from>[0-9]+)-(?P<to>[0-9]+)\]")
-
-class StatementGroup(list):
-    def eval(self, data):
-        for statement in self:
-            statement.eval(data)
-
-class AstNode(object):
-    def __init__(self, filename, lineno):
-        self.filename = filename
-        self.lineno = lineno
-
-class IncludeNode(AstNode):
-    def __init__(self, filename, lineno, what_file, force):
-        AstNode.__init__(self, filename, lineno)
-        self.what_file = what_file
-        self.force = force
-
-    def eval(self, data):
-        """
-        Include the file and evaluate the statements
-        """
-        s = data.expand(self.what_file)
-        logger.debug(2, "CONF %s:%s: including %s", self.filename, self.lineno, s)
-
-        # TODO: Cache those includes... maybe not here though
-        if self.force:
-            bb.parse.ConfHandler.include(self.filename, s, self.lineno, data, "include required")
-        else:
-            bb.parse.ConfHandler.include(self.filename, s, self.lineno, data, False)
-
-class ExportNode(AstNode):
-    def __init__(self, filename, lineno, var):
-        AstNode.__init__(self, filename, lineno)
-        self.var = var
-
-    def eval(self, data):
-        data.setVarFlag(self.var, "export", 1, op = 'exported')
-
-class DataNode(AstNode):
-    """
-    Various data related updates. For the sake of sanity
-    we have one class doing all this. This means that all
-    this need to be re-evaluated... we might be able to do
-    that faster with multiple classes.
-    """
-    def __init__(self, filename, lineno, groupd):
-        AstNode.__init__(self, filename, lineno)
-        self.groupd = groupd
-
-    def getFunc(self, key, data):
-        if 'flag' in self.groupd and self.groupd['flag'] != None:
-            return data.getVarFlag(key, self.groupd['flag'], noweakdefault=True)
-        else:
-            return data.getVar(key, noweakdefault=True)
-
-    def eval(self, data):
-        groupd = self.groupd
-        key = groupd["var"]
-        loginfo = {
-            'variable': key,
-            'file': self.filename,
-            'line': self.lineno,
-        }
-        if "exp" in groupd and groupd["exp"] != None:
-            data.setVarFlag(key, "export", 1, op = 'exported', **loginfo)
-
-        op = "set"
-        if "ques" in groupd and groupd["ques"] != None:
-            val = self.getFunc(key, data)
-            op = "set?"
-            if val == None:
-                val = groupd["value"]
-        elif "colon" in groupd and groupd["colon"] != None:
-            e = data.createCopy()
-            bb.data.update_data(e)
-            op = "immediate"
-            val = e.expand(groupd["value"], key + "[:=]")
-        elif "append" in groupd and groupd["append"] != None:
-            op = "append"
-            val = "%s %s" % ((self.getFunc(key, data) or ""), groupd["value"])
-        elif "prepend" in groupd and groupd["prepend"] != None:
-            op = "prepend"
-            val = "%s %s" % (groupd["value"], (self.getFunc(key, data) or ""))
-        elif "postdot" in groupd and groupd["postdot"] != None:
-            op = "postdot"
-            val = "%s%s" % ((self.getFunc(key, data) or ""), groupd["value"])
-        elif "predot" in groupd and groupd["predot"] != None:
-            op = "predot"
-            val = "%s%s" % (groupd["value"], (self.getFunc(key, data) or ""))
-        else:
-            val = groupd["value"]
-
-        flag = None
-        if 'flag' in groupd and groupd['flag'] != None:
-            flag = groupd['flag']
-        elif groupd["lazyques"]:
-            flag = "defaultval"
-
-        loginfo['op'] = op
-        loginfo['detail'] = groupd["value"]
-
-        if flag:
-            data.setVarFlag(key, flag, val, **loginfo)
-        else:
-            data.setVar(key, val, **loginfo)
-
-class MethodNode(AstNode):
-    def __init__(self, filename, lineno, func_name, body):
-        AstNode.__init__(self, filename, lineno)
-        self.func_name = func_name
-        self.body = body
-
-    def eval(self, data):
-        text = '\n'.join(self.body)
-        if self.func_name == "__anonymous":
-            funcname = ("__anon_%s_%s" % (self.lineno, self.filename.translate(string.maketrans('/.+-@', '_____'))))
-            text = "def %s(d):\n" % (funcname) + text
-            bb.methodpool.insert_method(funcname, text, self.filename)
-            anonfuncs = data.getVar('__BBANONFUNCS') or []
-            anonfuncs.append(funcname)
-            data.setVar('__BBANONFUNCS', anonfuncs)
-            data.setVar(funcname, text)
-        else:
-            data.setVarFlag(self.func_name, "func", 1)
-            data.setVar(self.func_name, text)
-
-class PythonMethodNode(AstNode):
-    def __init__(self, filename, lineno, function, modulename, body):
-        AstNode.__init__(self, filename, lineno)
-        self.function = function
-        self.modulename = modulename
-        self.body = body
-
-    def eval(self, data):
-        # Note we will add root to parsedmethods after having parse
-        # 'this' file. This means we will not parse methods from
-        # bb classes twice
-        text = '\n'.join(self.body)
-        bb.methodpool.insert_method(self.modulename, text, self.filename)
-        data.setVarFlag(self.function, "func", 1)
-        data.setVarFlag(self.function, "python", 1)
-        data.setVar(self.function, text)
-
-class MethodFlagsNode(AstNode):
-    def __init__(self, filename, lineno, key, m):
-        AstNode.__init__(self, filename, lineno)
-        self.key = key
-        self.m = m
-
-    def eval(self, data):
-        if data.getVar(self.key):
-            # clean up old version of this piece of metadata, as its
-            # flags could cause problems
-            data.setVarFlag(self.key, 'python', None)
-            data.setVarFlag(self.key, 'fakeroot', None)
-        if self.m.group("py") is not None:
-            data.setVarFlag(self.key, "python", "1")
-        else:
-            data.delVarFlag(self.key, "python")
-        if self.m.group("fr") is not None:
-            data.setVarFlag(self.key, "fakeroot", "1")
-        else:
-            data.delVarFlag(self.key, "fakeroot")
-
-class ExportFuncsNode(AstNode):
-    def __init__(self, filename, lineno, fns, classname):
-        AstNode.__init__(self, filename, lineno)
-        self.n = fns.split()
-        self.classname = classname
-
-    def eval(self, data):
-
-        for func in self.n:
-            calledfunc = self.classname + "_" + func
-
-            if data.getVar(func) and not data.getVarFlag(func, 'export_func'):
-                continue
-
-            if data.getVar(func):
-                data.setVarFlag(func, 'python', None)
-                data.setVarFlag(func, 'func', None)
-
-            for flag in [ "func", "python" ]:
-                if data.getVarFlag(calledfunc, flag):
-                    data.setVarFlag(func, flag, data.getVarFlag(calledfunc, flag))
-            for flag in [ "dirs" ]:
-                if data.getVarFlag(func, flag):
-                    data.setVarFlag(calledfunc, flag, data.getVarFlag(func, flag))
-
-            if data.getVarFlag(calledfunc, "python"):
-                data.setVar(func, "    bb.build.exec_func('" + calledfunc + "', d)\n")
-            else:
-                data.setVar(func, "    " + calledfunc + "\n")
-            data.setVarFlag(func, 'export_func', '1')
-
-class AddTaskNode(AstNode):
-    def __init__(self, filename, lineno, func, before, after):
-        AstNode.__init__(self, filename, lineno)
-        self.func = func
-        self.before = before
-        self.after = after
-
-    def eval(self, data):
-        bb.build.addtask(self.func, self.before, self.after, data)
-
-class DelTaskNode(AstNode):
-    def __init__(self, filename, lineno, func):
-        AstNode.__init__(self, filename, lineno)
-        self.func = func
-
-    def eval(self, data):
-        bb.build.deltask(self.func, data)
-
-class BBHandlerNode(AstNode):
-    def __init__(self, filename, lineno, fns):
-        AstNode.__init__(self, filename, lineno)
-        self.hs = fns.split()
-
-    def eval(self, data):
-        bbhands = data.getVar('__BBHANDLERS') or []
-        for h in self.hs:
-            bbhands.append(h)
-            data.setVarFlag(h, "handler", 1)
-        data.setVar('__BBHANDLERS', bbhands)
-
-class InheritNode(AstNode):
-    def __init__(self, filename, lineno, classes):
-        AstNode.__init__(self, filename, lineno)
-        self.classes = classes
-
-    def eval(self, data):
-        bb.parse.BBHandler.inherit(self.classes, self.filename, self.lineno, data)
-
-def handleInclude(statements, filename, lineno, m, force):
-    statements.append(IncludeNode(filename, lineno, m.group(1), force))
-
-def handleExport(statements, filename, lineno, m):
-    statements.append(ExportNode(filename, lineno, m.group(1)))
-
-def handleData(statements, filename, lineno, groupd):
-    statements.append(DataNode(filename, lineno, groupd))
-
-def handleMethod(statements, filename, lineno, func_name, body):
-    statements.append(MethodNode(filename, lineno, func_name, body))
-
-def handlePythonMethod(statements, filename, lineno, funcname, modulename, body):
-    statements.append(PythonMethodNode(filename, lineno, funcname, modulename, body))
-
-def handleMethodFlags(statements, filename, lineno, key, m):
-    statements.append(MethodFlagsNode(filename, lineno, key, m))
-
-def handleExportFuncs(statements, filename, lineno, m, classname):
-    statements.append(ExportFuncsNode(filename, lineno, m.group(1), classname))
-
-def handleAddTask(statements, filename, lineno, m):
-    func = m.group("func")
-    before = m.group("before")
-    after = m.group("after")
-    if func is None:
-        return
-
-    statements.append(AddTaskNode(filename, lineno, func, before, after))
-
-def handleDelTask(statements, filename, lineno, m):
-    func = m.group("func")
-    if func is None:
-        return
-
-    statements.append(DelTaskNode(filename, lineno, func))
-
-def handleBBHandlers(statements, filename, lineno, m):
-    statements.append(BBHandlerNode(filename, lineno, m.group(1)))
-
-def handleInherit(statements, filename, lineno, m):
-    classes = m.group(1)
-    statements.append(InheritNode(filename, lineno, classes))
-
-def finalize(fn, d, variant = None):
-    all_handlers = {}
-    for var in d.getVar('__BBHANDLERS') or []:
-        # try to add the handler
-        bb.event.register(var, d.getVar(var), (d.getVarFlag(var, "eventmask", True) or "").split())
-
-    bb.event.fire(bb.event.RecipePreFinalise(fn), d)
-
-    bb.data.expandKeys(d)
-    bb.data.update_data(d)
-    code = []
-    for funcname in d.getVar("__BBANONFUNCS") or []:
-        code.append("%s(d)" % funcname)
-    bb.utils.better_exec("\n".join(code), {"d": d})
-    bb.data.update_data(d)
-
-    tasklist = d.getVar('__BBTASKS') or []
-    deltasklist = d.getVar('__BBDELTASKS') or []
-    bb.build.add_tasks(tasklist, deltasklist, d)
-
-    bb.parse.siggen.finalise(fn, d, variant)
-
-    d.setVar('BBINCLUDED', bb.parse.get_file_depends(d))
-
-    bb.event.fire(bb.event.RecipeParsed(fn), d)
-
-def _create_variants(datastores, names, function):
-    def create_variant(name, orig_d, arg = None):
-        new_d = bb.data.createCopy(orig_d)
-        function(arg or name, new_d)
-        datastores[name] = new_d
-
-    for variant, variant_d in datastores.items():
-        for name in names:
-            if not variant:
-                # Based on main recipe
-                create_variant(name, variant_d)
-            else:
-                create_variant("%s-%s" % (variant, name), variant_d, name)
-
-def _expand_versions(versions):
-    def expand_one(version, start, end):
-        for i in xrange(start, end + 1):
-            ver = _bbversions_re.sub(str(i), version, 1)
-            yield ver
-
-    versions = iter(versions)
-    while True:
-        try:
-            version = next(versions)
-        except StopIteration:
-            break
-
-        range_ver = _bbversions_re.search(version)
-        if not range_ver:
-            yield version
-        else:
-            newversions = expand_one(version, int(range_ver.group("from")),
-                                     int(range_ver.group("to")))
-            versions = itertools.chain(newversions, versions)
-
-def multi_finalize(fn, d):
-    appends = (d.getVar("__BBAPPEND", True) or "").split()
-    for append in appends:
-        logger.debug(2, "Appending .bbappend file %s to %s", append, fn)
-        bb.parse.BBHandler.handle(append, d, True)
-
-    onlyfinalise = d.getVar("__ONLYFINALISE", False)
-
-    safe_d = d
-    d = bb.data.createCopy(safe_d)
-    try:
-        finalize(fn, d)
-    except bb.parse.SkipPackage as e:
-        d.setVar("__SKIPPED", e.args[0])
-    datastores = {"": safe_d}
-
-    versions = (d.getVar("BBVERSIONS", True) or "").split()
-    if versions:
-        pv = orig_pv = d.getVar("PV", True)
-        baseversions = {}
-
-        def verfunc(ver, d, pv_d = None):
-            if pv_d is None:
-                pv_d = d
-
-            overrides = d.getVar("OVERRIDES", True).split(":")
-            pv_d.setVar("PV", ver)
-            overrides.append(ver)
-            bpv = baseversions.get(ver) or orig_pv
-            pv_d.setVar("BPV", bpv)
-            overrides.append(bpv)
-            d.setVar("OVERRIDES", ":".join(overrides))
-
-        versions = list(_expand_versions(versions))
-        for pos, version in enumerate(list(versions)):
-            try:
-                pv, bpv = version.split(":", 2)
-            except ValueError:
-                pass
-            else:
-                versions[pos] = pv
-                baseversions[pv] = bpv
-
-        if pv in versions and not baseversions.get(pv):
-            versions.remove(pv)
-        else:
-            pv = versions.pop()
-
-            # This is necessary because our existing main datastore
-            # has already been finalized with the old PV, we need one
-            # that's been finalized with the new PV.
-            d = bb.data.createCopy(safe_d)
-            verfunc(pv, d, safe_d)
-            try:
-                finalize(fn, d)
-            except bb.parse.SkipPackage as e:
-                d.setVar("__SKIPPED", e.args[0])
-
-        _create_variants(datastores, versions, verfunc)
-
-    extended = d.getVar("BBCLASSEXTEND", True) or ""
-    if extended:
-        # the following is to support bbextends with arguments, for e.g. multilib
-        # an example is as follows:
-        #   BBCLASSEXTEND = "multilib:lib32"
-        # it will create foo-lib32, inheriting multilib.bbclass and set
-        # BBEXTENDCURR to "multilib" and BBEXTENDVARIANT to "lib32"
-        extendedmap = {}
-        variantmap = {}
-
-        for ext in extended.split():
-            eext = ext.split(':', 2)
-            if len(eext) > 1:
-                extendedmap[ext] = eext[0]
-                variantmap[ext] = eext[1]
-            else:
-                extendedmap[ext] = ext
-
-        pn = d.getVar("PN", True)
-        def extendfunc(name, d):
-            if name != extendedmap[name]:
-                d.setVar("BBEXTENDCURR", extendedmap[name])
-                d.setVar("BBEXTENDVARIANT", variantmap[name])
-            else:
-                d.setVar("PN", "%s-%s" % (pn, name))
-            bb.parse.BBHandler.inherit(extendedmap[name], fn, 0, d)
-
-        safe_d.setVar("BBCLASSEXTEND", extended)
-        _create_variants(datastores, extendedmap.keys(), extendfunc)
-
-    for variant, variant_d in datastores.iteritems():
-        if variant:
-            try:
-                if not onlyfinalise or variant in onlyfinalise:
-                    finalize(fn, variant_d, variant)
-            except bb.parse.SkipPackage as e:
-                variant_d.setVar("__SKIPPED", e.args[0])
-
-    if len(datastores) > 1:
-        variants = filter(None, datastores.iterkeys())
-        safe_d.setVar("__VARIANTS", " ".join(variants))
-
-    datastores[""] = d
-    return datastores

bitbake/lib/bb/parse/parse_py/BBHandler.py

@@ -11,7 +11,7 @@
 
 #  Copyright (C) 2003, 2004  Chris Larson
 #  Copyright (C) 2003, 2004  Phil Blundell
-#
+#   
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
@@ -25,35 +25,27 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-from __future__ import absolute_import
-import re, bb, os
-import logging
-import bb.build, bb.utils
-from bb import data
+import re, bb, os, sys, time
+import bb.fetch, bb.build, bb.utils
+from bb import data, fetch, methodpool
 
-from . import ConfHandler
-from .. import resolve_file, ast, logger
-from .ConfHandler import include, init
-
-# For compatibility
-bb.deprecate_import(__name__, "bb.parse", ["vars_from_file"])
+from ConfHandler import include, localpath, obtain, init
+from bb.parse import ParseError
 
 __func_start_regexp__    = re.compile( r"(((?P<py>python)|(?P<fr>fakeroot))\s*)*(?P<func>[\w\.\-\+\{\}\$]+)?\s*\(\s*\)\s*{$" )
 __inherit_regexp__       = re.compile( r"inherit\s+(.+)" )
 __export_func_regexp__   = re.compile( r"EXPORT_FUNCTIONS\s+(.+)" )
 __addtask_regexp__       = re.compile("addtask\s+(?P<func>\w+)\s*((before\s*(?P<before>((.*(?=after))|(.*))))|(after\s*(?P<after>((.*(?=before))|(.*)))))*")
-__deltask_regexp__       = re.compile("deltask\s+(?P<func>\w+)")
 __addhandler_regexp__    = re.compile( r"addhandler\s+(.+)" )
 __def_regexp__           = re.compile( r"def\s+(\w+).*:" )
 __python_func_regexp__   = re.compile( r"(\s+.*)|(^$)" )
-
+__word__ = re.compile(r"\S+")
 
 __infunc__ = ""
 __inpython__ = False
 __body__   = []
 __classname__ = ""
-
-cached_statements = {}
+classes = [ None, ]
 
 # We need to indicate EOF to the feeder. This code is so messy that
 # factoring it out to a close_parse_file method is out of question.
@@ -62,123 +54,157 @@ cached_statements = {}
 # The two parts using it are tightly integrated anyway
 IN_PYTHON_EOF = -9999999999999
 
-
+__parsed_methods__ = methodpool.get_parsed_dict()
 
 def supports(fn, d):
-    """Return True if fn has a supported extension"""
-    return os.path.splitext(fn)[-1] in [".bb", ".bbclass", ".inc"]
+    localfn = localpath(fn, d)
+    return localfn[-3:] == ".bb" or localfn[-8:] == ".bbclass" or localfn[-4:] == ".inc"
 
-def inherit(files, fn, lineno, d):
-    __inherit_cache = d.getVar('__inherit_cache') or []
-    files = d.expand(files).split()
+def inherit(files, d):
+    __inherit_cache = data.getVar('__inherit_cache', d) or []
+    fn = ""
+    lineno = 0
+    files = data.expand(files, d)
     for file in files:
-        if not os.path.isabs(file) and not file.endswith(".bbclass"):
+        if file[0] != "/" and file[-8:] != ".bbclass":
             file = os.path.join('classes', '%s.bbclass' % file)
 
-        if not os.path.isabs(file):
-            dname = os.path.dirname(fn)
-            bbpath = "%s:%s" % (dname, d.getVar("BBPATH", True))
-            abs_fn, attempts = bb.utils.which(bbpath, file, history=True)
-            for af in attempts:
-                if af != abs_fn:
-                    bb.parse.mark_dependency(d, af)
-            if abs_fn:
-                file = abs_fn
-
         if not file in __inherit_cache:
-            logger.log(logging.DEBUG -1, "BB %s:%d: inheriting %s", fn, lineno, file)
+            bb.msg.debug(2, bb.msg.domain.Parsing, "BB %s:%d: inheriting %s" % (fn, lineno, file))
             __inherit_cache.append( file )
-            d.setVar('__inherit_cache', __inherit_cache)
-            include(fn, file, lineno, d, "inherit")
-            __inherit_cache = d.getVar('__inherit_cache') or []
+            data.setVar('__inherit_cache', __inherit_cache, d)
+            include(fn, file, d, "inherit")
+            __inherit_cache = data.getVar('__inherit_cache', d) or []
 
-def get_statements(filename, absolute_filename, base_name):
-    global cached_statements
-
-    try:
-        return cached_statements[absolute_filename]
-    except KeyError:
-        file = open(absolute_filename, 'r')
-        statements = ast.StatementGroup()
-
-        lineno = 0
-        while True:
-            lineno = lineno + 1
-            s = file.readline()
-            if not s: break
-            s = s.rstrip()
-            feeder(lineno, s, filename, base_name, statements)
-        file.close()
-        if __inpython__:
-            # add a blank line to close out any python definition
-            feeder(IN_PYTHON_EOF, "", filename, base_name, statements)
-
-        if filename.endswith(".bbclass") or filename.endswith(".inc"):
-            cached_statements[absolute_filename] = statements
-        return statements
-
-def handle(fn, d, include):
-    global __func_start_regexp__, __inherit_regexp__, __export_func_regexp__, __addtask_regexp__, __addhandler_regexp__, __infunc__, __body__, __residue__, __classname__
+def handle(fn, d, include = 0):
+    global __func_start_regexp__, __inherit_regexp__, __export_func_regexp__, __addtask_regexp__, __addhandler_regexp__, __infunc__, __body__, __residue__
     __body__ = []
     __infunc__ = ""
     __classname__ = ""
     __residue__ = []
 
-
     if include == 0:
-        logger.debug(2, "BB %s: handle(data)", fn)
+        bb.msg.debug(2, bb.msg.domain.Parsing, "BB " + fn + ": handle(data)")
     else:
-        logger.debug(2, "BB %s: handle(data, include)", fn)
+        bb.msg.debug(2, bb.msg.domain.Parsing, "BB " + fn + ": handle(data, include)")
 
-    base_name = os.path.basename(fn)
-    (root, ext) = os.path.splitext(base_name)
+    (root, ext) = os.path.splitext(os.path.basename(fn))
+    base_name = "%s%s" % (root,ext)
     init(d)
 
     if ext == ".bbclass":
         __classname__ = root
-        __inherit_cache = d.getVar('__inherit_cache') or []
+        classes.append(__classname__)
+        __inherit_cache = data.getVar('__inherit_cache', d) or []
         if not fn in __inherit_cache:
             __inherit_cache.append(fn)
-            d.setVar('__inherit_cache', __inherit_cache)
+            data.setVar('__inherit_cache', __inherit_cache, d)
 
     if include != 0:
-        oldfile = d.getVar('FILE')
+        oldfile = data.getVar('FILE', d)
     else:
         oldfile = None
 
-    abs_fn = resolve_file(fn, d)
+    fn = obtain(fn, d)
+    bbpath = (data.getVar('BBPATH', d, 1) or '').split(':')
+    if not os.path.isabs(fn):
+        f = None
+        for p in bbpath:
+            j = os.path.join(p, fn)
+            if os.access(j, os.R_OK):
+                abs_fn = j
+                f = open(j, 'r')
+                break
+        if f is None:
+            raise IOError("file not found")
+    else:
+        f = open(fn,'r')
+        abs_fn = fn
+
+    if ext != ".bbclass":
+        dname = os.path.dirname(abs_fn)
+        if bbpath[0] != dname:
+            bbpath.insert(0, dname)
+            data.setVar('BBPATH', ":".join(bbpath), d)
 
     if include:
         bb.parse.mark_dependency(d, abs_fn)
 
-    # actual loading
-    statements = get_statements(fn, abs_fn, base_name)
-
-    # DONE WITH PARSING... time to evaluate
     if ext != ".bbclass":
-        d.setVar('FILE', abs_fn)
+        data.setVar('FILE', fn, d)
 
-    try:
-        statements.eval(d)
-    except bb.parse.SkipPackage:
-        bb.data.setVar("__SKIPPED", True, d)
+    lineno = 0
+    while 1:
+        lineno = lineno + 1
+        s = f.readline()
+        if not s: break
+        s = s.rstrip()
+        feeder(lineno, s, fn, base_name, d)
+    if __inpython__:
+        # add a blank line to close out any python definition
+        feeder(IN_PYTHON_EOF, "", fn, base_name, d)
+    if ext == ".bbclass":
+        classes.remove(__classname__)
+    else:
         if include == 0:
-            return { "" : d }
+            data.expandKeys(d)
+            data.update_data(d)
+            anonqueue = data.getVar("__anonqueue", d, 1) or []
+            body = [x['content'] for x in anonqueue]
+            flag = { 'python' : 1, 'func' : 1 }
+            data.setVar("__anonfunc", "\n".join(body), d)
+            data.setVarFlags("__anonfunc", flag, d)
+            from bb import build
+            try:
+                t = data.getVar('T', d)
+                data.setVar('T', '${TMPDIR}/', d)
+                build.exec_func("__anonfunc", d)
+                data.delVar('T', d)
+                if t:
+                    data.setVar('T', t, d)
+            except Exception, e:
+                bb.msg.debug(1, bb.msg.domain.Parsing, "Exception when executing anonymous function: %s" % e)
+                raise
+            data.delVar("__anonqueue", d)
+            data.delVar("__anonfunc", d)
+            set_additional_vars(fn, d, include)
+            data.update_data(d)
 
-    if ext != ".bbclass" and include == 0:
-        return ast.multi_finalize(fn, d)
+            all_handlers = {} 
+            for var in data.getVar('__BBHANDLERS', d) or []:
+                # try to add the handler
+                handler = data.getVar(var,d)
+                bb.event.register(var, handler)
 
+            tasklist = data.getVar('__BBTASKS', d) or []
+            bb.build.add_tasks(tasklist, d)
+
+        bbpath.pop(0)
     if oldfile:
-        d.setVar("FILE", oldfile)
+        bb.data.setVar("FILE", oldfile, d)
+
+    # we have parsed the bb class now
+    if ext == ".bbclass" or ext == ".inc":
+        __parsed_methods__[base_name] = 1
 
     return d
 
-def feeder(lineno, s, fn, root, statements):
-    global __func_start_regexp__, __inherit_regexp__, __export_func_regexp__, __addtask_regexp__, __addhandler_regexp__, __def_regexp__, __python_func_regexp__, __inpython__, __infunc__, __body__, bb, __residue__, __classname__
+def feeder(lineno, s, fn, root, d):
+    global __func_start_regexp__, __inherit_regexp__, __export_func_regexp__, __addtask_regexp__, __addhandler_regexp__, __def_regexp__, __python_func_regexp__, __inpython__,__infunc__, __body__, classes, bb, __residue__
     if __infunc__:
         if s == '}':
             __body__.append('')
-            ast.handleMethod(statements, fn, lineno, __infunc__, __body__)
+            data.setVar(__infunc__, '\n'.join(__body__), d)
+            data.setVarFlag(__infunc__, "func", 1, d)
+            if __infunc__ == "__anonymous":
+                anonqueue = bb.data.getVar("__anonqueue", d) or []
+                anonitem = {}
+                anonitem["content"] = bb.data.getVar("__anonymous", d)
+                anonitem["flags"] = bb.data.getVarFlags("__anonymous", d)
+                anonqueue.append(anonitem)
+                bb.data.setVar("__anonqueue", anonqueue, d)
+                bb.data.delVarFlags("__anonymous", d)
+                bb.data.delVar("__anonymous", d)
             __infunc__ = ""
             __body__ = []
         else:
@@ -191,77 +217,200 @@ def feeder(lineno, s, fn, root, statements):
             __body__.append(s)
             return
         else:
-            ast.handlePythonMethod(statements, fn, lineno, __inpython__,
-                                   root, __body__)
+            # Note we will add root to parsedmethods after having parse
+            # 'this' file. This means we will not parse methods from
+            # bb classes twice
+            if not root  in __parsed_methods__:
+                text = '\n'.join(__body__)
+                methodpool.insert_method( root, text, fn )
+                funcs = data.getVar('__functions__', d) or {}
+                if not funcs.has_key( root ):
+                    funcs[root] = text 
+                else:
+                    funcs[root] = "%s\n%s" % (funcs[root], text)
+
+                data.setVar('__functions__', funcs, d)
             __body__ = []
             __inpython__ = False
 
             if lineno == IN_PYTHON_EOF:
                 return
 
-    if s and s[0] == '#':
-        if len(__residue__) != 0 and __residue__[0][0] != "#":
-            bb.fatal("There is a comment on line %s of file %s (%s) which is in the middle of a multiline expression.\nBitbake used to ignore these but no longer does so, please fix your metadata as errors are likely as a result of this change." % (lineno, fn, s))
+#           fall through
 
-    if len(__residue__) != 0 and __residue__[0][0] == "#" and (not s or s[0] != "#"):
-        bb.fatal("There is a confusing multiline, partially commented expression on line %s of file %s (%s).\nPlease clarify whether this is all a comment or should be parsed." % (lineno, fn, s))
+    if s == '' or s[0] == '#': return          # skip comments and empty lines
 
-    if s and s[-1] == '\\':
+    if s[-1] == '\\':
         __residue__.append(s[:-1])
         return
 
     s = "".join(__residue__) + s
     __residue__ = []
 
-    # Skip empty lines
-    if s == '':
-        return   
-
-    # Skip comments
-    if s[0] == '#':
-        return
-
     m = __func_start_regexp__.match(s)
     if m:
         __infunc__ = m.group("func") or "__anonymous"
-        ast.handleMethodFlags(statements, fn, lineno, __infunc__, m)
+        key = __infunc__
+        if data.getVar(key, d):
+#           clean up old version of this piece of metadata, as its
+#           flags could cause problems
+            data.setVarFlag(key, 'python', None, d)
+            data.setVarFlag(key, 'fakeroot', None, d)
+        if m.group("py") is not None:
+            data.setVarFlag(key, "python", "1", d)
+        else:
+            data.delVarFlag(key, "python", d)
+        if m.group("fr") is not None:
+            data.setVarFlag(key, "fakeroot", "1", d)
+        else:
+            data.delVarFlag(key, "fakeroot", d)
         return
 
     m = __def_regexp__.match(s)
     if m:
         __body__.append(s)
-        __inpython__ = m.group(1)
-
+        __inpython__ = True
         return
 
     m = __export_func_regexp__.match(s)
     if m:
-        ast.handleExportFuncs(statements, fn, lineno, m, __classname__)
+        fns = m.group(1)
+        n = __word__.findall(fns)
+        for f in n:
+            allvars = []
+            allvars.append(f)
+            allvars.append(classes[-1] + "_" + f)
+
+            vars = [[ allvars[0], allvars[1] ]]
+            if len(classes) > 1 and classes[-2] is not None:
+                allvars.append(classes[-2] + "_" + f)
+                vars = []
+                vars.append([allvars[2], allvars[1]])
+                vars.append([allvars[0], allvars[2]])
+
+            for (var, calledvar) in vars:
+                if data.getVar(var, d) and not data.getVarFlag(var, 'export_func', d):
+                    continue
+
+                if data.getVar(var, d):
+                    data.setVarFlag(var, 'python', None, d)
+                    data.setVarFlag(var, 'func', None, d)
+
+                for flag in [ "func", "python" ]:
+                    if data.getVarFlag(calledvar, flag, d):
+                        data.setVarFlag(var, flag, data.getVarFlag(calledvar, flag, d), d)
+                for flag in [ "dirs" ]:
+                    if data.getVarFlag(var, flag, d):
+                        data.setVarFlag(calledvar, flag, data.getVarFlag(var, flag, d), d)
+
+                if data.getVarFlag(calledvar, "python", d):
+                    data.setVar(var, "\tbb.build.exec_func('" + calledvar + "', d)\n", d)
+                else:
+                    data.setVar(var, "\t" + calledvar + "\n", d)
+                data.setVarFlag(var, 'export_func', '1', d)
+
         return
 
     m = __addtask_regexp__.match(s)
     if m:
-        ast.handleAddTask(statements, fn, lineno, m)
-        return
+        func = m.group("func")
+        before = m.group("before")
+        after = m.group("after")
+        if func is None:
+            return
+        var = "do_" + func
 
-    m = __deltask_regexp__.match(s)
-    if m:
-        ast.handleDelTask(statements, fn, lineno, m)
+        data.setVarFlag(var, "task", 1, d)
+
+        bbtasks = data.getVar('__BBTASKS', d) or []
+        if not var in bbtasks:
+            bbtasks.append(var)
+        data.setVar('__BBTASKS', bbtasks, d)
+
+        existing = data.getVarFlag(var, "deps", d) or []
+        if after is not None:
+            # set up deps for function
+            for entry in after.split():
+                if entry not in existing:
+                    existing.append(entry)
+        data.setVarFlag(var, "deps", existing, d)
+        if before is not None:
+            # set up things that depend on this func
+            for entry in before.split():
+                existing = data.getVarFlag(entry, "deps", d) or []
+                if var not in existing:
+                    data.setVarFlag(entry, "deps", [var] + existing, d)
         return
 
     m = __addhandler_regexp__.match(s)
     if m:
-        ast.handleBBHandlers(statements, fn, lineno, m)
+        fns = m.group(1)
+        hs = __word__.findall(fns)
+        bbhands = data.getVar('__BBHANDLERS', d) or []
+        for h in hs:
+            bbhands.append(h)
+            data.setVarFlag(h, "handler", 1, d)
+        data.setVar('__BBHANDLERS', bbhands, d)
         return
 
     m = __inherit_regexp__.match(s)
     if m:
-        ast.handleInherit(statements, fn, lineno, m)
+
+        files = m.group(1)
+        n = __word__.findall(files)
+        inherit(n, d)
         return
 
-    return ConfHandler.feeder(lineno, s, fn, statements)
+    from bb.parse import ConfHandler
+    return ConfHandler.feeder(lineno, s, fn, d)
+
+__pkgsplit_cache__={}
+def vars_from_file(mypkg, d):
+    if not mypkg:
+        return (None, None, None)
+    if mypkg in __pkgsplit_cache__:
+        return __pkgsplit_cache__[mypkg]
+
+    myfile = os.path.splitext(os.path.basename(mypkg))
+    parts = myfile[0].split('_')
+    __pkgsplit_cache__[mypkg] = parts
+    if len(parts) > 3:
+        raise ParseError("Unable to generate default variables from the filename: %s (too many underscores)" % mypkg)
+    exp = 3 - len(parts)
+    tmplist = []
+    while exp != 0:
+        exp -= 1
+        tmplist.append(None)
+    parts.extend(tmplist)
+    return parts
+
+def set_additional_vars(file, d, include):
+    """Deduce rest of variables, e.g. ${A} out of ${SRC_URI}"""
+
+    return
+    # Nothing seems to use this variable
+    #bb.msg.debug(2, bb.msg.domain.Parsing, "BB %s: set_additional_vars" % file)
+
+    #src_uri = data.getVar('SRC_URI', d, 1)
+    #if not src_uri:
+    #    return
+
+    #a = (data.getVar('A', d, 1) or '').split()
+
+    #from bb import fetch
+    #try:
+    #    ud = fetch.init(src_uri.split(), d)
+    #    a += fetch.localpaths(d, ud)
+    #except fetch.NoMethodError:
+    #    pass
+    #except bb.MalformedUrl,e:
+    #    raise ParseError("Unable to generate local paths for SRC_URI due to malformed uri: %s" % e)
+    #del fetch
+
+    #data.setVar('A', " ".join(a), d)
+
 
 # Add us to the handlers list
-from .. import handlers
+from bb.parse import handlers
 handlers.append({'supports': supports, 'handle': handle, 'init': init})
 del handlers

bitbake/lib/bb/parse/parse_py/ConfHandler.py

@@ -10,7 +10,7 @@
 
 # Copyright (C) 2003, 2004  Chris Larson
 # Copyright (C) 2003, 2004  Phil Blundell
-#
+# 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
@@ -24,164 +24,203 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-import re, os
-import logging
-import bb.utils
-from bb.parse import ParseError, resolve_file, ast, logger
+import re, bb.data, os, sys
+from bb.parse import ParseError
 
-__config_regexp__  = re.compile( r"""
-    ^
-    (?P<exp>export\s*)?
-    (?P<var>[a-zA-Z0-9\-~_+.${}/]+?)
-    (\[(?P<flag>[a-zA-Z0-9\-_+.]+)\])?
-
-    \s* (
-        (?P<colon>:=) |
-        (?P<lazyques>\?\?=) |
-        (?P<ques>\?=) |
-        (?P<append>\+=) |
-        (?P<prepend>=\+) |
-        (?P<predot>=\.) |
-        (?P<postdot>\.=) |
-        =
-    ) \s*
-
-    (?!'[^']*'[^']*'$)
-    (?!\"[^\"]*\"[^\"]*\"$)
-    (?P<apo>['\"])
-    (?P<value>.*)
-    (?P=apo)
-    $
-    """, re.X)
+#__config_regexp__  = re.compile( r"(?P<exp>export\s*)?(?P<var>[a-zA-Z0-9\-_+.${}]+)\s*(?P<colon>:)?(?P<ques>\?)?=\s*(?P<apo>['\"]?)(?P<value>.*)(?P=apo)$")
+__config_regexp__  = re.compile( r"(?P<exp>export\s*)?(?P<var>[a-zA-Z0-9\-_+.${}/]+)(\[(?P<flag>[a-zA-Z0-9\-_+.]+)\])?\s*((?P<colon>:=)|(?P<ques>\?=)|(?P<append>\+=)|(?P<prepend>=\+)|(?P<predot>=\.)|(?P<postdot>\.=)|=)\s*(?P<apo>['\"]?)(?P<value>.*)(?P=apo)$")
 __include_regexp__ = re.compile( r"include\s+(.+)" )
 __require_regexp__ = re.compile( r"require\s+(.+)" )
-__export_regexp__ = re.compile( r"export\s+([a-zA-Z0-9\-_+.${}/]+)$" )
+__export_regexp__ = re.compile( r"export\s+(.+)" )
 
 def init(data):
-    topdir = data.getVar('TOPDIR')
-    if not topdir:
-        data.setVar('TOPDIR', os.getcwd())
-
+    if not bb.data.getVar('TOPDIR', data):
+        bb.data.setVar('TOPDIR', os.getcwd(), data)
+    if not bb.data.getVar('BBPATH', data):
+        bb.data.setVar('BBPATH', os.path.join(sys.prefix, 'share', 'bitbake'), data)
 
 def supports(fn, d):
-    return fn[-5:] == ".conf"
+    return localpath(fn, d)[-5:] == ".conf"
 
-def include(oldfn, fn, lineno, data, error_out):
+def localpath(fn, d):
+    if os.path.exists(fn):
+        return fn
+
+    if "://" not in fn:
+        return fn
+
+    localfn = None
+    try:
+        localfn = bb.fetch.localpath(fn, d, False)
+    except bb.MalformedUrl:
+        pass
+
+    if not localfn:
+        return fn
+    return localfn
+
+def obtain(fn, data):
+    import sys, bb
+    fn = bb.data.expand(fn, data)
+    localfn = bb.data.expand(localpath(fn, data), data)
+
+    if localfn != fn:
+        dldir = bb.data.getVar('DL_DIR', data, 1)
+        if not dldir:
+            bb.msg.debug(1, bb.msg.domain.Parsing, "obtain: DL_DIR not defined")
+            return localfn
+        bb.mkdirhier(dldir)
+        try:
+            bb.fetch.init([fn], data)
+        except bb.fetch.NoMethodError:
+            (type, value, traceback) = sys.exc_info()
+            bb.msg.debug(1, bb.msg.domain.Parsing, "obtain: no method: %s" % value)
+            return localfn
+
+        try:
+            bb.fetch.go(data)
+        except bb.fetch.MissingParameterError:
+            (type, value, traceback) = sys.exc_info()
+            bb.msg.debug(1, bb.msg.domain.Parsing, "obtain: missing parameters: %s" % value)
+            return localfn
+        except bb.fetch.FetchError:
+            (type, value, traceback) = sys.exc_info()
+            bb.msg.debug(1, bb.msg.domain.Parsing, "obtain: failed: %s" % value)
+            return localfn
+    return localfn
+
+
+def include(oldfn, fn, data, error_out):
     """
-    error_out: A string indicating the verb (e.g. "include", "inherit") to be
-    used in a ParseError that will be raised if the file to be included could
-    not be included. Specify False to avoid raising an error in this case.
+
+    error_out If True a ParseError will be reaised if the to be included
     """
-    if oldfn == fn: # prevent infinite recursion
+    if oldfn == fn: # prevent infinate recursion
         return None
 
     import bb
-    fn = data.expand(fn)
-    oldfn = data.expand(oldfn)
-
-    if not os.path.isabs(fn):
-        dname = os.path.dirname(oldfn)
-        bbpath = "%s:%s" % (dname, data.getVar("BBPATH", True))
-        abs_fn, attempts = bb.utils.which(bbpath, fn, history=True)
-        if abs_fn and bb.parse.check_dependency(data, abs_fn):
-            bb.warn("Duplicate inclusion for %s in %s" % (abs_fn, data.getVar('FILE', True)))
-        for af in attempts:
-            bb.parse.mark_dependency(data, af)
-        if abs_fn:
-            fn = abs_fn
-    elif bb.parse.check_dependency(data, fn):
-        bb.warn("Duplicate inclusion for %s in %s" % (fn, data.getVar('FILE', True)))
+    fn = bb.data.expand(fn, data)
+    oldfn = bb.data.expand(oldfn, data)
 
     from bb.parse import handle
     try:
         ret = handle(fn, data, True)
-    except (IOError, OSError):
+    except IOError:
         if error_out:
-            raise ParseError("Could not %(error_out)s file %(fn)s" % vars(), oldfn, lineno)
-        logger.debug(2, "CONF file '%s' not found", fn)
-        bb.parse.mark_dependency(data, fn)
+            raise ParseError("Could not %(error_out)s file %(fn)s" % vars() )
+        bb.msg.debug(2, bb.msg.domain.Parsing, "CONF file '%s' not found" % fn)
 
-# We have an issue where a UI might want to enforce particular settings such as
-# an empty DISTRO variable. If configuration files do something like assigning
-# a weak default, it turns out to be very difficult to filter out these changes,
-# particularly when the weak default might appear half way though parsing a chain 
-# of configuration files. We therefore let the UIs hook into configuration file
-# parsing. This turns out to be a hard problem to solve any other way.
-confFilters = []
-
-def handle(fn, data, include):
+def handle(fn, data, include = 0):
+    if include:
+        inc_string = "including"
+    else:
+        inc_string = "reading"
     init(data)
 
     if include == 0:
+        bb.data.inheritFromOS(data)
         oldfile = None
     else:
-        oldfile = data.getVar('FILE')
+        oldfile = bb.data.getVar('FILE', data)
 
-    abs_fn = resolve_file(fn, data)
-    f = open(abs_fn, 'r')
+    fn = obtain(fn, data)
+    if not os.path.isabs(fn):
+        f = None
+        bbpath = bb.data.getVar("BBPATH", data, 1) or []
+        for p in bbpath.split(":"):
+            currname = os.path.join(p, fn)
+            if os.access(currname, os.R_OK):
+                f = open(currname, 'r')
+                abs_fn = currname
+                bb.msg.debug(2, bb.msg.domain.Parsing, "CONF %s %s" % (inc_string, currname))
+                break
+        if f is None:
+            raise IOError("file '%s' not found" % fn)
+    else:
+        f = open(fn,'r')
+        bb.msg.debug(1, bb.msg.domain.Parsing, "CONF %s %s" % (inc_string,fn))
+        abs_fn = fn
 
     if include:
         bb.parse.mark_dependency(data, abs_fn)
 
-    statements = ast.StatementGroup()
     lineno = 0
-    while True:
+    bb.data.setVar('FILE', fn, data)
+    while 1:
         lineno = lineno + 1
         s = f.readline()
-        if not s:
-            break
+        if not s: break
         w = s.strip()
-        # skip empty lines
-        if not w:
-            continue
+        if not w: continue          # skip empty lines
         s = s.rstrip()
+        if s[0] == '#': continue    # skip comments
         while s[-1] == '\\':
-            s2 = f.readline().strip()
+            s2 = f.readline()[:-1].strip()
             lineno = lineno + 1
-            if (not s2 or s2 and s2[0] != "#") and s[0] == "#" :
-                bb.fatal("There is a confusing multiline, partially commented expression on line %s of file %s (%s).\nPlease clarify whether this is all a comment or should be parsed." % (lineno, fn, s))
             s = s[:-1] + s2
-        # skip comments
-        if s[0] == '#':
-            continue
-        feeder(lineno, s, fn, statements)
+        feeder(lineno, s, fn, data)
 
-    # DONE WITH PARSING... time to evaluate
-    data.setVar('FILE', abs_fn)
-    statements.eval(data)
     if oldfile:
-        data.setVar('FILE', oldfile)
-
-    f.close()
-
-    for f in confFilters:
-        f(fn, data)
-
+        bb.data.setVar('FILE', oldfile, data)
     return data
 
-def feeder(lineno, s, fn, statements):
+def feeder(lineno, s, fn, data):
+    def getFunc(groupd, key, data):
+        if 'flag' in groupd and groupd['flag'] != None:
+            return bb.data.getVarFlag(key, groupd['flag'], data)
+        else:
+            return bb.data.getVar(key, data)
+
     m = __config_regexp__.match(s)
     if m:
         groupd = m.groupdict()
-        ast.handleData(statements, fn, lineno, groupd)
+        key = groupd["var"]
+        if "exp" in groupd and groupd["exp"] != None:
+            bb.data.setVarFlag(key, "export", 1, data)
+        if "ques" in groupd and groupd["ques"] != None:
+            val = getFunc(groupd, key, data)
+            if val == None:
+                val = groupd["value"]
+        elif "colon" in groupd and groupd["colon"] != None:
+            e = data.createCopy()
+            bb.data.update_data(e)
+            val = bb.data.expand(groupd["value"], e)
+        elif "append" in groupd and groupd["append"] != None:
+            val = "%s %s" % ((getFunc(groupd, key, data) or ""), groupd["value"])
+        elif "prepend" in groupd and groupd["prepend"] != None:
+            val = "%s %s" % (groupd["value"], (getFunc(groupd, key, data) or ""))
+        elif "postdot" in groupd and groupd["postdot"] != None:
+            val = "%s%s" % ((getFunc(groupd, key, data) or ""), groupd["value"])
+        elif "predot" in groupd and groupd["predot"] != None:
+            val = "%s%s" % (groupd["value"], (getFunc(groupd, key, data) or ""))
+        else:
+            val = groupd["value"]
+        if 'flag' in groupd and groupd['flag'] != None:
+            bb.msg.debug(3, bb.msg.domain.Parsing, "setVarFlag(%s, %s, %s, data)" % (key, groupd['flag'], val))
+            bb.data.setVarFlag(key, groupd['flag'], val, data)
+        else:
+            bb.data.setVar(key, val, data)
         return
 
     m = __include_regexp__.match(s)
     if m:
-        ast.handleInclude(statements, fn, lineno, m, False)
+        s = bb.data.expand(m.group(1), data)
+        bb.msg.debug(3, bb.msg.domain.Parsing, "CONF %s:%d: including %s" % (fn, lineno, s))
+        include(fn, s, data, False)
         return
 
     m = __require_regexp__.match(s)
     if m:
-        ast.handleInclude(statements, fn, lineno, m, True)
+        s = bb.data.expand(m.group(1), data)
+        include(fn, s, data, "include required")
         return
 
     m = __export_regexp__.match(s)
     if m:
-        ast.handleExport(statements, fn, lineno, m)
+        bb.data.setVarFlag(m.group(1), "export", 1, data)
         return
 
-    raise ParseError("unparsed line: '%s'" % s, fn, lineno);
+    raise ParseError("%s:%d: unparsed line: '%s'" % (fn, lineno, s));
 
 # Add us to the handlers list
 from bb.parse import handlers

bitbake/lib/bb/parse/parse_py/__init__.py

@@ -25,9 +25,9 @@ File parsers for the BitBake build tools.
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Based on functions from the base bb module, Copyright 2003 Holger Schurig
-
-from __future__ import absolute_import
-from . import ConfHandler
-from . import BBHandler
-
 __version__ = '1.0'
+
+__all__ = [ 'ConfHandler', 'BBHandler']
+
+import ConfHandler
+import BBHandler

bitbake/lib/bb/persist_data.py

@@ -1,12 +1,6 @@
-"""BitBake Persistent Data Store
-
-Used to store data in a central location such that other threads/tasks can
-access them at some future date.  Acts as a convenience wrapper around sqlite,
-currently, providing a key/value store accessed by 'domain'.
-"""
-
+# BitBake Persistent Data Store
+#
 # Copyright (C) 2007        Richard Purdie
-# Copyright (C) 2010        Chris Larson <chris_larson@mentor.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -21,195 +15,96 @@ currently, providing a key/value store accessed by 'domain'.
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-import collections
-import logging
-import os.path
-import sys
-import warnings
-from bb.compat import total_ordering
-from collections import Mapping
+import bb, os
 
 try:
     import sqlite3
 except ImportError:
-    from pysqlite2 import dbapi2 as sqlite3
+    try:
+        from pysqlite2 import dbapi2 as sqlite3
+    except ImportError:
+        bb.msg.fatal(bb.msg.domain.PersistData, "Importing sqlite3 and pysqlite2 failed, please install one of them. Python 2.5 or a 'python-pysqlite2' like package is likely to be what you need.")
 
 sqlversion = sqlite3.sqlite_version_info
 if sqlversion[0] < 3 or (sqlversion[0] == 3 and sqlversion[1] < 3):
-    raise Exception("sqlite3 version 3.3.0 or later is required.")
+    bb.msg.fatal(bb.msg.domain.PersistData, "sqlite3 version 3.3.0 or later is required.")
 
+class PersistData:
+    """
+    BitBake Persistent Data Store
 
-logger = logging.getLogger("BitBake.PersistData")
-if hasattr(sqlite3, 'enable_shared_cache'):
-    try:
-        sqlite3.enable_shared_cache(True)
-    except sqlite3.OperationalError:
-        pass
+    Used to store data in a central location such that other threads/tasks can 
+    access them at some future date.
 
+    The "domain" is used as a key to isolate each data pool and in this 
+    implementation corresponds to an SQL table. The SQL table consists of a 
+    simple key and value pair.
 
-@total_ordering
-class SQLTable(collections.MutableMapping):
-    """Object representing a table/domain in the database"""
-    def __init__(self, cachefile, table):
-        self.cachefile = cachefile
-        self.table = table
-        self.cursor = connect(self.cachefile)
-
-        self._execute("CREATE TABLE IF NOT EXISTS %s(key TEXT, value TEXT);"
-                      % table)
-
-    def _execute(self, *query):
-        """Execute a query, waiting to acquire a lock if necessary"""
-        count = 0
-        while True:
-            try:
-                return self.cursor.execute(*query)
-            except sqlite3.OperationalError as exc:
-                if 'database is locked' in str(exc) and count < 500:
-                    count = count + 1
-                    self.cursor.close()
-                    self.cursor = connect(self.cachefile)
-                    continue
-                raise
-
-    def __enter__(self):
-        self.cursor.__enter__()
-        return self
-
-    def __exit__(self, *excinfo):
-        self.cursor.__exit__(*excinfo)
-
-    def __getitem__(self, key):
-        data = self._execute("SELECT * from %s where key=?;" %
-                             self.table, [key])
-        for row in data:
-            return row[1]
-        raise KeyError(key)
-
-    def __delitem__(self, key):
-        if key not in self:
-            raise KeyError(key)
-        self._execute("DELETE from %s where key=?;" % self.table, [key])
-
-    def __setitem__(self, key, value):
-        if not isinstance(key, basestring):
-            raise TypeError('Only string keys are supported')
-        elif not isinstance(value, basestring):
-            raise TypeError('Only string values are supported')
-
-        data = self._execute("SELECT * from %s where key=?;" %
-                                   self.table, [key])
-        exists = len(list(data))
-        if exists:
-            self._execute("UPDATE %s SET value=? WHERE key=?;" % self.table,
-                          [value, key])
-        else:
-            self._execute("INSERT into %s(key, value) values (?, ?);" %
-                          self.table, [key, value])
-
-    def __contains__(self, key):
-        return key in set(self)
-
-    def __len__(self):
-        data = self._execute("SELECT COUNT(key) FROM %s;" % self.table)
-        for row in data:
-            return row[0]
-
-    def __iter__(self):
-        data = self._execute("SELECT key FROM %s;" % self.table)
-        return (row[0] for row in data)
-
-    def __lt__(self, other):
-        if not isinstance(other, Mapping):
-            raise NotImplemented
-
-        return len(self) < len(other)
-
-    def get_by_pattern(self, pattern):
-        data = self._execute("SELECT * FROM %s WHERE key LIKE ?;" %
-                             self.table, [pattern])
-        return [row[1] for row in data]
-
-    def values(self):
-        return list(self.itervalues())
-
-    def itervalues(self):
-        data = self._execute("SELECT value FROM %s;" % self.table)
-        return (row[0] for row in data)
-
-    def items(self):
-        return list(self.iteritems())
-
-    def iteritems(self):
-        return self._execute("SELECT * FROM %s;" % self.table)
-
-    def clear(self):
-        self._execute("DELETE FROM %s;" % self.table)
-
-    def has_key(self, key):
-        return key in self
-
-
-class PersistData(object):
-    """Deprecated representation of the bitbake persistent data store"""
+    Why sqlite? It handles all the locking issues for us.
+    """
     def __init__(self, d):
-        warnings.warn("Use of PersistData is deprecated.  Please use "
-                      "persist(domain, d) instead.",
-                      category=DeprecationWarning,
-                      stacklevel=2)
+        self.cachedir = bb.data.getVar("PERSISTENT_DIR", d, True) or bb.data.getVar("CACHE", d, True)
+        if self.cachedir in [None, '']:
+            bb.msg.fatal(bb.msg.domain.PersistData, "Please set the 'PERSISTENT_DIR' or 'CACHE' variable.")
+        try:
+            os.stat(self.cachedir)
+        except OSError:
+            bb.mkdirhier(self.cachedir)
 
-        self.data = persist(d)
-        logger.debug(1, "Using '%s' as the persistent data cache",
-                     self.data.filename)
+        self.cachefile = os.path.join(self.cachedir,"bb_persist_data.sqlite3")
+        bb.msg.debug(1, bb.msg.domain.PersistData, "Using '%s' as the persistent data cache" % self.cachefile)
+
+        self.connection = sqlite3.connect(self.cachefile, timeout=5, isolation_level=None)
 
     def addDomain(self, domain):
         """
-        Add a domain (pending deprecation)
+        Should be called before any domain is used
+        Creates it if it doesn't exist.
         """
-        return self.data[domain]
+        self.connection.execute("CREATE TABLE IF NOT EXISTS %s(key TEXT, value TEXT);" % domain)
 
     def delDomain(self, domain):
         """
         Removes a domain and all the data it contains
         """
-        del self.data[domain]
-
-    def getKeyValues(self, domain):
-        """
-        Return a list of key + value pairs for a domain
-        """
-        return self.data[domain].items()
+        self.connection.execute("DROP TABLE IF EXISTS %s;" % domain)
 
     def getValue(self, domain, key):
         """
         Return the value of a key for a domain
         """
-        return self.data[domain][key]
+        data = self.connection.execute("SELECT * from %s where key=?;" % domain, [key])
+        for row in data:
+            return row[1]
 
     def setValue(self, domain, key, value):
         """
         Sets the value of a key for a domain
         """
-        self.data[domain][key] = value
+        data = self.connection.execute("SELECT * from %s where key=?;" % domain, [key])
+        rows = 0
+        for row in data:
+            rows = rows + 1
+        if rows:
+            self._execute("UPDATE %s SET value=? WHERE key=?;" % domain, [value, key])
+        else:
+            self._execute("INSERT into %s(key, value) values (?, ?);" % domain, [key, value])
 
     def delValue(self, domain, key):
         """
         Deletes a key/value pair
         """
-        del self.data[domain][key]
+        self._execute("DELETE from %s where key=?;" % domain, [key])
 
-def connect(database):
-    return sqlite3.connect(database, timeout=5, isolation_level=None)
+    def _execute(self, *query):
+        while True:	
+            try:
+                self.connection.execute(*query)
+                return
+            except sqlite3.OperationalError, e:
+                if 'database is locked' in str(e):
+                    continue
+                raise
+        
+        
 
-def persist(domain, d):
-    """Convenience factory for SQLTable objects based upon metadata"""
-    import bb.utils
-    cachedir = (d.getVar("PERSISTENT_DIR", True) or
-                d.getVar("CACHE", True))
-    if not cachedir:
-        logger.critical("Please set the 'PERSISTENT_DIR' or 'CACHE' variable")
-        sys.exit(1)
-
-    bb.utils.mkdirhier(cachedir)
-    cachefile = os.path.join(cachedir, "bb_persist_data.sqlite3")
-    return SQLTable(cachefile, domain)