diff options
26 files changed, 48 insertions, 45 deletions
diff --git a/classes/debian.bbclass b/classes/debian.bbclass index 7ffa6c1a27..3992a76084 100644 --- a/classes/debian.bbclass +++ b/classes/debian.bbclass @@ -101,5 +101,5 @@ python debian_package_name_hook () { EXPORT_FUNCTIONS package_name_hook -DEBIAN_NAMES = 1 +DEBIAN_NAMES = "1" diff --git a/classes/devshell.bbclass b/classes/devshell.bbclass index 118e5e4a2a..14f957e12b 100644 --- a/classes/devshell.bbclass +++ b/classes/devshell.bbclass @@ -1,8 +1,8 @@ -EXTRA_OEMAKE[export] = 1 +EXTRA_OEMAKE[export] = "1" do_devshell[dirs] = "${S}" -do_devshell[nostamp] = 1 -do_devshell[interactive] = 1 +do_devshell[nostamp] = "1" +do_devshell[interactive] = "1" devshell_do_devshell() { bash -i } diff --git a/classes/oelint.bbclass b/classes/oelint.bbclass index c9e39d13fb..f2e7540dcf 100644 --- a/classes/oelint.bbclass +++ b/classes/oelint.bbclass @@ -1,5 +1,5 @@ addtask lint before do_fetch -do_lint[nostamp] = 1 +do_lint[nostamp] = "1" python do_lint() { def testVar(var, explain=None): try: diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index f0a721fd4a..9aba940da4 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -35,10 +35,10 @@ PSTAGE_PKGNAME = "staging-${PN}_${PV}-${PR}_${PACKAGE_ARCH}.ipk" PCROSS_PKGNAME = "cross-${PN}_${PV}-${PR}_${BUILD_ARCH}.ipk" SPAWNFILE = "${STAGING_DIR}/pkgmaps/${P}-${PR}.spawn" -SPAWNIPK = ${spawn} +SPAWNIPK = "${spawn}" -PSTAGE_TMPDIR_STAGE = ${TMPDIR}/tmp-staging -PSTAGE_TMPDIR_CROSS = ${TMPDIR}/tmp-cross +PSTAGE_TMPDIR_STAGE = "${TMPDIR}/tmp-staging" +PSTAGE_TMPDIR_CROSS = "${TMPDIR}/tmp-cross" STAGING_BASEDIR = "${STAGING_LIBDIR}/.." diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index eeb3f75e11..c4b2991874 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -11,9 +11,9 @@ RDEPENDS += "ipkg ipkg-collateral" PACKAGES = "" -do_rootfs[nostamp] = 1 -do_rootfs[dirs] = ${TOPDIR} -do_build[nostamp] = 1 +do_rootfs[nostamp] = "1" +do_rootfs[dirs] = "${TOPDIR}" +do_build[nostamp] = "1" IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}" diff --git a/classes/srec.bbclass b/classes/srec.bbclass index e7bdc6c75d..a869a4f1f3 100644 --- a/classes/srec.bbclass +++ b/classes/srec.bbclass @@ -10,7 +10,7 @@ SREC_CMD = "${TARGET_PREFIX}objcopy -O srec -I binary --adjust-vma ${SREC_VMAADD # Do not build srec files for these types of images: SREC_SKIP = "tar" -do_srec[nostamp] = 1 +do_srec[nostamp] = "1" do_srec () { if [ ${SREC_VMAADDR} = "" ] ; then diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 57d167505b..515999cee0 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -358,7 +358,7 @@ MKTEMPCMD = "mktemp -q ${TMPBASE}" # a RCS, which freaks out those special folks with active Perforce clients # the following makes patch ignore RCS: -export PATCH_GET=0 +export PATCH_GET="0" # Program to be used to build ipkg packages diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf index 66dc4fb0a6..362e6e5a30 100644 --- a/conf/distro/amsdelta-oe.conf +++ b/conf/distro/amsdelta-oe.conf @@ -21,8 +21,8 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDER_virtual/libiconv=glibc -PREFERRED_PROVIDER_virtual/libintl=glibc +PREFERRED_PROVIDER_virtual/libiconv="glibc" +PREFERRED_PROVIDER_virtual/libintl="glibc" # The CSL compiler is unusable because # 1) certain programs stop to compile diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 738a0cef78..5e7ce0d40c 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -19,7 +19,7 @@ DISTRO_TYPE = "debug" #Set the right arch for the feeds #Alphabetically sorted -FEED_ARCH ?= ${TARGET_ARCH} +FEED_ARCH ?= "${TARGET_ARCH}" #armv4t machines @@ -119,7 +119,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" # Virtuals: PREFERRED_PROVIDER_virtual/db ?= "db" PREFERRED_PROVIDER_virtual/db-native ?= "db-native" -PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" # Others: PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf index e28fb85d88..e86ffa028c 100644 --- a/conf/distro/debianslug.conf +++ b/conf/distro/debianslug.conf @@ -13,7 +13,7 @@ SLUGOS_IMAGENAME = "debianslug" SLUGOS_IMAGESEX = "little-endian" # debianslug builds a complete image (not just the parts) -SLUGOS_FLASH_IMAGE = "yes" +SLUGOS_FLASH_IMAGE = "nslu2" # NOTE: to build new packages set DEBIANSLUG_EXTRA_BBFILES to the full path name to # the .bb files for the packages to build - see debianslug-packages.conf in this diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 3bb5df5496..27c0437cf5 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -71,7 +71,7 @@ require conf/distro/include/sane-srcdates.inc # Framebuffer & X # PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" -PREFERRED_PROVIDER_tslib ?= tslib +PREFERRED_PROVIDER_tslib ?= "tslib" require conf/distro/include/preferred-xorg-versions-X11R7.1.inc # diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index a3d9694295..3bf87abdb6 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -42,7 +42,7 @@ SLUGOS_IMAGESEX = "little-endian" #Name the generated images in a sane way IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" -DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE} +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" # Angstrom *always* has some form of release config, so error out if someone thinks he knows better DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/conf/distro/include/preferred-gpe-versions-2.6.inc b/conf/distro/include/preferred-gpe-versions-2.6.inc index 256bc0103f..9eb5b90abb 100644 --- a/conf/distro/include/preferred-gpe-versions-2.6.inc +++ b/conf/distro/include/preferred-gpe-versions-2.6.inc @@ -3,13 +3,13 @@ # #work around some breakages -SRCDATE_xserver-kdrive=20050207 -SRCDATE_minimo=20050401 -SRCDATE_cairo=20050330 -SRCDATE_xext=20050222 +SRCDATE_xserver-kdrive="20050207" +SRCDATE_minimo="20050401" +SRCDATE_cairo="20050330" +SRCDATE_xext="20050222" #set some preferred providers: -PREFERRED_PROVIDER_gconf=gconf-dbus +PREFERRED_PROVIDER_gconf="gconf-dbus" #specify versions, as the header says :) PREFERRED_VERSION_libmatchbox ?= "1.6" diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc index 56d9c5b059..662dfc386f 100644 --- a/conf/distro/include/preferred-gpe-versions-2.7.inc +++ b/conf/distro/include/preferred-gpe-versions-2.7.inc @@ -6,8 +6,8 @@ #SRCDATE_minimo=20050401 #set some preferred providers: -PREFERRED_PROVIDER_gconf=gconf-dbus -PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus +PREFERRED_PROVIDER_gconf="gconf-dbus" +PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus" #specify versions, as the header says :) PREFERRED_VERSION_libmatchbox ?= "1.7" diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc index 9c9be528df..bf00aa8d01 100644 --- a/conf/distro/include/preferred-gpe-versions-2.8.inc +++ b/conf/distro/include/preferred-gpe-versions-2.8.inc @@ -3,8 +3,8 @@ # #set some preferred providers: -PREFERRED_PROVIDER_gconf=gconf-dbus -PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus +PREFERRED_PROVIDER_gconf="gconf-dbus" +PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus" PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" diff --git a/conf/distro/include/preferred-gpe-versions.inc b/conf/distro/include/preferred-gpe-versions.inc index e78888a02c..7d4efea06e 100644 --- a/conf/distro/include/preferred-gpe-versions.inc +++ b/conf/distro/include/preferred-gpe-versions.inc @@ -6,8 +6,8 @@ #SRCDATE_xext=20050222 #set some preferred providers: -PREFERRED_PROVIDER_gconf=gconf-dbus -PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus +PREFERRED_PROVIDER_gconf="gconf-dbus" +PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus" #specify versions, as the header says :) #PREFERRED_VERSION_libmatchbox ?= "1.6" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index e015314d92..07b144c7c1 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -113,8 +113,9 @@ SLUGOS_IMAGENAME ?= "${DISTRO_NAME}" # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) CMDLINE_DEBUG = "noirqdebug" -# Building a full image. If you set SLUGOS_FLASH_IMAGE to "yes" a complete -# 8MByte flash image will be built after the rootfs JFFS2 image. +# Building a full image. If you set SLUGOS_FLASH_IMAGE to "nslu2" a complete +# 8MByte flash image will be built after the rootfs JFFS2 image. Other options +# may later be defined for other vendor-flashable image types. # # If you do this you will need to find a source for the LinkSys software to be # placed in the full image - 'RedBoot' (the boot loader), 'Trailer' (just a bunch diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf index b4875dc37b..19379862ae 100644 --- a/conf/distro/jlime-shrek.conf +++ b/conf/distro/jlime-shrek.conf @@ -36,7 +36,7 @@ BBINCLUDELOGS = "yes" MODUTILS = "26" IMAGE_FSTYPES = "tar.bz2" -BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs ncurses nano wireless-tools \ +BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs ncurses nano wireless-tools \ kernel-module-3c574-cs kernel-module-3c589-cs kernel-module-8390 \ kernel-module-airo-cs kernel-module-airo console-tools \ kernel-module-arlan \ diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf index 0366998e79..7452c26eaa 100644 --- a/conf/distro/openslug-native.conf +++ b/conf/distro/openslug-native.conf @@ -16,5 +16,5 @@ ASSUME_PROVIDED = "libtool-cross \ " # Our build host is armeb, not armv5eb that the kernel reports -BUILD_ARCH = armeb +BUILD_ARCH = "armeb" diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index d5ceeee105..c24001f3f4 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -13,7 +13,7 @@ SLUGOS_IMAGENAME = "openslug" SLUGOS_IMAGESEX = "big-endian" # openslug builds a complete image (not just the parts) -SLUGOS_FLASH_IMAGE = "yes" +SLUGOS_FLASH_IMAGE = "nslu2" # NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to # the .bb files for the packages to build - see ucslugc-packages.conf in this diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index b1080d1fea..10f00b7604 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -33,7 +33,7 @@ SRCDATE ?= "20060701" ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95" PREFERRED_PROVIDER_hostap-conf = "hostap-conf" PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -PREFERRED_PROVIDER_tslib ?= tslib +PREFERRED_PROVIDER_tslib ?= "tslib" KERNEL_CONSOLE = "ttyS0" #DEBUG_OPTIMIZATION = "-O -g3" diff --git a/conf/machine/amsdelta.conf b/conf/machine/amsdelta.conf index 443b70c5de..85afdc85f4 100644 --- a/conf/machine/amsdelta.conf +++ b/conf/machine/amsdelta.conf @@ -19,7 +19,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" GUI_MACHINE_CLASS="smallscreen" -PREFERRED_VERSION_u-boot = 1.1.4 +PREFERRED_VERSION_u-boot = "1.1.4" TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index 3f3b2f916e..1ea4a68639 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the HP iPAQ h1930 and h1940 IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" -TARGET_ARCH = arm +TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-h1940" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf index 2bf6cc2d8e..cd943f7e65 100644 --- a/conf/machine/lite5200.conf +++ b/conf/machine/lite5200.conf @@ -4,7 +4,7 @@ UBOOT_MACHINE = "Lite5200" SERIAL_CONSOLE="38400 ttyS0" -TARGET_PREFIX = powerpc-603e-linux-gnu- +TARGET_PREFIX = "powerpc-603e-linux-gnu-" IMAGE_FSTYPES = "jffs2 tar.bz2" diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index 7073105e24..90a5cefcbe 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -6,11 +6,12 @@ DESCRIPTION = "Generic SlugOS image" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r36" +PR = "r37" # SLUGOS_IMAGENAME defines the name of the image to be build, if it # is not set this package will be skipped! IMAGE_BASENAME = "${SLUGOS_IMAGENAME}" +IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}" IMAGE_FSTYPES = "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --${SLUGOS_IMAGESEX} --eraseblock=0x20000 -D ${SLUGOS_DEVICE_TABLE}" IMAGE_LINGUAS = "" @@ -113,13 +114,13 @@ python () { # LinkSys have made "EraseAll" available, however, (this does overwrite RedBoot) # it is a bad idea to produce flash images without a valid RedBoot - that allows # an innocent user upgrade attempt to instantly brick the NSLU2. -PACK_IMAGE += "${@['', 'nslu2_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'yes']}" -PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'yes']}" +PACK_IMAGE += "${@['', 'nslu2_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}" +PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}" NSLU2_SLUGIMAGE_ARGS ?= "" nslu2_pack_image() { - if test '${SLUGOS_FLASH_IMAGE}' = yes + if test '${SLUGOS_FLASH_IMAGE}' = nslu2 then install -d ${DEPLOY_DIR_IMAGE}/slug install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index d585414f1f..82ca8313fd 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -1,7 +1,8 @@ LICENSE = MIT -PR = "r23" +PR = "r24" IMAGE_BASENAME = "unslung" +IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}" IMAGE_LINGUAS = "" USE_DEVFS = "1" |