Merge branch 'master' into testing-next

bin/sed

@@ -47,12 +47,10 @@ while getopts ne:f:$getopt_os opt; do
             save "$OPTARG"
             ;;
         i)
-            save "$inplace_arg"
-            continue
+            saved="$saved $inplace_arg"
             ;;
         r)
-            save "$extended_re_arg"
-            continue
+            saved="$saved $extended_re_arg"
             ;;
         \?)
             exit 1

bin/wrapper.sh

@@ -2,6 +2,8 @@ path_remove () {
     echo $PATH | tr ':' '\n' | grep -v "^$1\$" | tr '\n' ':'
 }
 
+PATH="$(path_remove $(dirname $0))"
+
 quote(){
     sed -e "s,','\\\\'',g; 1s,^,',; \$s,\$,',;" << EOF
 $1
@@ -23,7 +25,5 @@ save () {
 
 exec_real () {
     eval set -- "$saved"
-    scriptdir="$(dirname $0)"
-    PATH="$(path_remove $scriptdir)"
     exec "$(basename $0)" "$@"
 }

classes/image.bbclass

@@ -33,7 +33,8 @@ IMAGE_BOOT ?= "${IMAGE_INITSCRIPTS} \
 IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
 
 LINGUAS_INSTALL = ""
-LINGUAS_INSTALL_linux = "glibc-localedata-i18n"
+LINGUAS_INSTALL_linux = "${@base_ifelse(d.getVar('IMAGE_LINGUAS', True), \
+                                        'glibc-localedata-i18n', '')}"
 LINGUAS_INSTALL_linux += "${@' '.join(map(lambda s: 'locale-base-%s' % s, '${IMAGE_LINGUAS}'.split()))}"
 LINGUAS_INSTALL_linux-gnueabi = "${LINGUAS_INSTALL_linux}"
 

classes/meta.bbclass

@@ -1,4 +1,4 @@
-
+EXCLUDE_FROM_WORLD = "1"
 PACKAGES = ""
 
-do_build[recrdeptask] = "do_build"
+do_build[recrdeptask] = "do_build"

classes/srctree.bbclass

@@ -29,6 +29,8 @@ def remove_tasks(deltasks, d):
                 deps.remove(preptask)
         d.setVarFlag(task, "deps", deps)
 
+addtask configure after do_setscene
+
 def merge_tasks(d):
     """
     Merges all of the operations that occur prior to do_populate_sysroot

conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc

@@ -78,7 +78,7 @@ PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
 PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1"
+PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1+gitr%"
 PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-penmount ?= "1.4.0"
 PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1"

conf/distro/include/preferred-xorg-versions-live.inc

@@ -1,4 +1,4 @@
-#Mon Nov  1 07:54:05 CET 2010
+#Thu Nov  4 08:29:11 CET 2010
 #app
 PREFERRED_VERSION_appres ?= "1.0.3"
 PREFERRED_VERSION_bdftopcf ?= "1.0.3"
@@ -130,7 +130,7 @@ PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
 PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-mouse ?= "1.6.0"
-PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1"
+PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1+gitr%"
 PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-penmount ?= "1.4.1"
 PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1"
@@ -264,7 +264,7 @@ PREFERRED_VERSION_libxfont ?= "1.4.3"
 PREFERRED_VERSION_libxfont-native ?= "1.4.3"
 PREFERRED_VERSION_libxfontcache ?= "1.0.5"
 PREFERRED_VERSION_libxft ?= "2.2.0"
-PREFERRED_VERSION_libxi ?= "1.3.2"
+PREFERRED_VERSION_libxi ?= "1.4.0"
 PREFERRED_VERSION_libxinerama ?= "1.1.1"
 PREFERRED_VERSION_libxmu ?= "1.1.0"
 PREFERRED_VERSION_libxp ?= "1.0.0"
@@ -340,8 +340,8 @@ PREFERRED_VERSION_xf86miscproto ?= "0.9.3"
 PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
 PREFERRED_VERSION_xf86vidmodeproto ?= "2.3"
 PREFERRED_VERSION_xineramaproto ?= "1.2"
-PREFERRED_VERSION_xproto ?= "7.0.18"
-PREFERRED_VERSION_xproto-native ?= "7.0.18"
+PREFERRED_VERSION_xproto ?= "7.0.19"
+PREFERRED_VERSION_xproto-native ?= "7.0.19"
 PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
 #util
 PREFERRED_VERSION_gccmakedep ?= "1.0.2"

conf/distro/jlime-2010.1.conf

@@ -24,7 +24,7 @@ OVERRIDES .= ":jlime"
 # What we want on the bootstrap image (extra) 
 #
 DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
-			 console-tools tslib-tests parted dialog"
+			 console-tools tslib-tests dialog"
 
 #
 # Our Image files should look abit better.

conf/machine/bluepro.conf

@@ -0,0 +1,28 @@
+#@TYPE: Machine
+#@NAME: TQ Components' BluePro
+#@DESCRIPTION: Blue IPC Series
+
+TARGET_ARCH = "powerpc"
+PACKAGE_EXTRA_ARCHS = "ppc"
+
+MACHINE_FEATURES                = "kernel26 usbhost ext2"
+MACHINE_TASK_PROVIDER           = "task-base"
+MACHINE_EXTRA_RRECOMMENDS       = "u-boot-utils iproute2 canutils"
+
+USE_DEVFS = "0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+#PREFERRED_VERSION_linux = "2.6.32"
+PREFERRED_VERSION_linux-libc-headers = "2.6.32"
+
+# don't try to access tty1 (used for application code)
+USE_VT = "0"
+
+SERIAL_CONSOLE = "115200 ttyPSC0"
+KERNEL_DEVICETREE_tb5200l = "arch/${ARCH}/boot/dts/tqm5200.dts"
+EXTRA_IMAGECMD_jffs2 = "--big-endian -e 0x20000"
+
+# BluePro carries kernel in separate flash partition
+ROOTFS_POSTPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/*Image*;"
+
+require conf/machine/include/tune-ppc603e.inc

conf/machine/include/tune-mips32.inc

@@ -1 +1,3 @@
 TARGET_CC_ARCH = "-march=mips32"
+FEED_ARCH = "${TARGET_ARCH}"
+BASE_PACKAGE_ARCH = "${TARGET_ARCH}"

conf/machine/mx25-3stack.conf

@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@Name: Freescale i.MX25_3stack
+#@DESCRIPTION: Machine configuration for Freescale i.MX25_3stack
+#@Homepage: http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=IMX25PDK&fsrch=1
+
+TARGET_ARCH = "arm"
+
+MACHINE_FEATURES = "kernel26 apm alsa ext2 usbhost usbgadget touchscreen"
+
+GUI_MACHINE_CLASS = "smallscreen"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+UBOOT_MACHINE="mx25_3stack_config"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+KERNEL_IMAGETYPE = "uImage"
+
+require conf/machine/include/tune-arm926ejs.inc
+
+SERIAL_CONSOLE = "115200 ttymxc0"
+

conf/machine/tb5200l.conf

@@ -0,0 +1,28 @@
+#@TYPE: Machine
+#@NAME: TQ Components' Tiny Box TB5200L
+#@DESCRIPTION: Mini industrial control
+
+TARGET_ARCH = "powerpc"
+PACKAGE_EXTRA_ARCHS = "ppc"
+
+MACHINE_FEATURES                = "kernel26 usbhost ext2"
+MACHINE_TASK_PROVIDER           = "task-base"
+MACHINE_EXTRA_RRECOMMENDS       = "u-boot-utils iproute2 canutils"
+
+USE_DEVFS = "0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.32"
+PREFERRED_VERSION_linux-libc-headers = "2.6.32"
+
+# don't try to access tty1 (used for application code)
+USE_VT = "0"
+
+SERIAL_CONSOLE = "115200 ttyPSC0"
+KERNEL_DEVICETREE_tb5200l = "arch/${ARCH}/boot/dts/tqm5200.dts"
+EXTRA_IMAGECMD_jffs2 = "--big-endian -e 0x20000"
+
+# TB5200L carries kernel in separate flash partition
+ROOTFS_POSTPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/*Image*"
+
+require conf/machine/include/tune-ppc603e.inc

lib/oe/patch.py

@@ -73,16 +73,13 @@ def Import(self, patch, force = None):
         self.patches.insert(i, patch)
 
     def _applypatch(self, patch, force = False, reverse = False, run = True):
-        shellcmd = ["patch", "-p%s" % patch['strippath']]
+        shellcmd = ["patch", "-p%s" % patch['strippath'], "-f"]
         if reverse:
             shellcmd.append('-R')
 
         if not run:
             return subprocess.list2cmdline(shellcmd)
 
-        if force:
-            shellcmd.append('-f')
-
         patch = open(patch['file'], "r")
         return oe.process.run(shellcmd, cwd=self.dir, env=self.env, stdin=patch)
 

recipes/angstrom/angstrom-version.bb

@@ -9,10 +9,6 @@ SRC_URI = "file://lsb_release"
 PACKAGES = "${PN}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-export METADATA_REVISION
-export METADATA_BRANCH
-export TARGET_SYS
-
 do_install() {
 	install -d ${D}${sysconfdir}
 	echo "Angstrom ${DISTRO_VERSION}" > ${D}${sysconfdir}/angstrom-version

recipes/autoconf/autoconf.inc

@@ -8,13 +8,16 @@ RDEPENDS_${PN} = "m4 perl gnu-config"
 DEPENDS_virtclass-native = "m4-native gnu-config-native"
 RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native"
 
-INC_PR = "r9"
+INC_PR = "r10"
 
 SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2;name=autoconf \
 	   file://program_prefix.patch"
 
 inherit autotools
 
+# Excluded: tests man doc
+SUBDIRS = "bin . lib"
+
 do_configure_prepend () {
 	if ${@['true', 'false'][bb.data.inherits_class('native', d)]}
 	then
@@ -24,5 +27,10 @@ do_configure_prepend () {
 	fi
 }
 
+do_compile () {
+	sed -i -e's,^SUBDIRS = .*,SUBDIRS = ${SUBDIRS},' Makefile
+	oe_runmake
+}
+
 PARALLEL_MAKE = ""
 BBCLASSEXTEND = "native"

recipes/base-files/base-files/tb5200l/fstab

@@ -0,0 +1,10 @@
+# tb5200l filesystem, mount / read-only, mount /opt read-write
+
+rootfs		/		jffs2		defaults		1  1
+#/dev/mtdblock4 	/opt 		jffs2		defaults		0  0
+proc 		/proc 		proc		defaults		0  0
+devpts 		/dev/pts 	devpts		mode=0620,gid=5		0  0
+usbfs 		/proc/bus/usb 	usbfs		defaults		0  0
+tmpfs 		/var/volatile 	tmpfs		defaults		0  0
+tmpfs 		/dev/shm 	tmpfs		mode=0777		0  0
+tmpfs 		/media/ram 	tmpfs		defaults		0  0

recipes/base-files/base-files/tb5200l/issue

@@ -0,0 +1,2 @@
+Cameron Linux \n \l
+

recipes/base-files/base-files/tb5200l/issue.net

@@ -0,0 +1,3 @@
+Cameron Linux %h
+
+

recipes/base-files/base-files_3.0.14.bb

@@ -160,6 +160,12 @@ do_install_append_netbook-pro () {
 	mkdir -p ${D}/initrd
 }
 
+do_install_append_tb5200l() {
+	rmdir ${D}/tmp
+	ln -s var/tmp ${D}/tmp
+}
+
+
 PACKAGES = "${PN}-dbg ${PN}-doc ${PN}"
 FILES_${PN} = "/*"
 FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses"

recipes/bc/bc_1.06.bb

@@ -2,8 +2,22 @@ DESCRIPTION = "An arbitrary precision calculator language."
 SECTION = "console/utils"
 SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz"
 LICENSE = "GPL"
+PR = "r1"
 
 inherit autotools
 
+do_install () {
+	autotools_do_install
+	mv ${D}${bindir}/dc ${D}${bindir}/dc.${PN}
+}
+
+pkg_postinst_${PN} () {
+	update-alternatives --install ${bindir}/dc dc dc.${PN} 100
+}
+
+pkg_prerm_${PN} () {
+	update-alternatives --remove dc dc.${PN}
+}
+
 SRC_URI[md5sum] = "d44b5dddebd8a7a7309aea6c36fda117"
 SRC_URI[sha256sum] = "4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33"

recipes/bind/bind_9.3.6.bb

@@ -2,7 +2,7 @@ DESCRIPTION = "ISC Internet Domain Name Server"
 SECTION = "console/network"
 HOMEPAGE = "http://www.isc.org/sw/bind/"
 LICENSE = "BSD"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "openssl"
 
@@ -24,6 +24,7 @@ FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/nslookup"
 FILES_${PN}-dev += "${bindir}/isc-config.h"
 
 do_install_append() {
+	rm "${D}/usr/bin/nslookup"
 	install -d "${D}/etc/bind"
 	install -d "${D}/etc/init.d"
 	install -m 644 ${S}/conf/* "${D}/etc/bind"

recipes/cgreen/cgreen.inc

@@ -0,0 +1,14 @@
+DESCRIPTION = "Cgreen is a unit test framework for C language"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "flex-native"
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+INC_PR = "r0"
+
+BBCLASSEXTEND = "native sdk"
+
+inherit cmake
+

recipes/cgreen/cgreen_svn.bb

@@ -0,0 +1,15 @@
+require cgreen.inc
+
+SRCREV = "334"
+PR = "${INC_PR}.0"
+
+S = "${WORKDIR}/cgreen"
+
+SRC_URI = "svn://cgreen.svn.sourceforge.net/svnroot/cgreen/trunk;module=cgreen;proto=https"
+
+EXTRA_OECONF = ""
+EXTRA_OEMAKE = "INSTALL_PREFIX=${D}"
+
+EXTRA_OECMAKE = ""
+
+OECMAKE_SOURCEPATH = "../cgreen"

recipes/console-tools/console-tools_0.3.2.bb

@@ -1,7 +1,7 @@
 SECTION = "base"
 LICENSE = "GPL"
 DESCRIPTION = "Allows you to set-up and manipulate the Linux console."
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
            file://codepage.patch \
@@ -25,20 +25,23 @@ acpaths = "-I ${WORKDIR}/config"
 
 do_install () {
 	autotools_do_install
+	mv ${D}${bindir}/fgconsole ${D}${bindir}/fgconsole.${PN}
 	mv ${D}${bindir}/chvt ${D}${bindir}/chvt.${PN}
 	mv ${D}${bindir}/deallocvt ${D}${bindir}/deallocvt.${PN}
 	mv ${D}${bindir}/openvt ${D}${bindir}/openvt.${PN}
 	mv ${D}${bindir}/showkey ${D}${bindir}/showkey.${PN}
 }
 
 pkg_postinst_${PN} () {
+	update-alternatives --install ${bindir}/fgconsole fgconsole fgconsole.${PN} 100
 	update-alternatives --install ${bindir}/chvt chvt chvt.${PN} 100
 	update-alternatives --install ${bindir}/deallocvt deallocvt deallocvt.${PN} 100
 	update-alternatives --install ${bindir}/openvt openvt openvt.${PN} 100
 	update-alternatives --install ${bindir}/showkey showkey showkey.${PN} 100
 }
 
 pkg_prerm_${PN} () {
+	update-alternatives --remove fgconsole fgconsole.${PN}
 	update-alternatives --remove chvt chvt.${PN}
 	update-alternatives --remove deallocvt deallocvt.${PN}
 	update-alternatives --remove openvt openvt.${PN}