summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/core-image.bbclass6
-rw-r--r--meta/classes/imagetest-qemu.bbclass2
-rw-r--r--meta/classes/license.bbclass4
-rw-r--r--meta/conf/bitbake.conf3
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install.sh4
-rw-r--r--meta/recipes-devtools/prelink/prelink_git.bb2
6 files changed, 10 insertions, 11 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index 832319a5ae..c8c6a57426 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -1,11 +1,11 @@
1# Common for Poky images 1# Common code for generating core reference images
2# 2#
3# Copyright (C) 2007 OpenedHand LTD 3# Copyright (C) 2007-2011 Linux Foundation
4 4
5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
7 7
8# IMAGE_FEATURES control content of images built with Poky. 8# IMAGE_FEATURES control content of the core reference images
9# 9#
10# By default we install task-core-boot and task-base packages - this gives us 10# By default we install task-core-boot and task-base packages - this gives us
11# working (console only) rootfs. 11# working (console only) rootfs.
diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass
index e71403ece3..daeb8d8c9c 100644
--- a/meta/classes/imagetest-qemu.bbclass
+++ b/meta/classes/imagetest-qemu.bbclass
@@ -29,7 +29,7 @@ def qemuimagetest_main(d):
29 import os 29 import os
30 30
31 """ 31 """
32 Test Controller for Poky Testing. 32 Test Controller for automated testing.
33 """ 33 """
34 34
35 casestr = re.compile(r'(?P<scen>\w+\b):(?P<case>\w+$)') 35 casestr = re.compile(r'(?P<scen>\w+\b):(?P<case>\w+$)')
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 5e9ebe5ef4..d0a14187ff 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -1,4 +1,4 @@
1# Populates LICENSE_DIRECTORY as set in poky.conf with the license files as set by 1# Populates LICENSE_DIRECTORY as set in distro config with the license files as set by
2# LIC_FILES_CHKSUM. 2# LIC_FILES_CHKSUM.
3# TODO: 3# TODO:
4# - We should also enable the ability to put the generated license directory onto the 4# - We should also enable the ability to put the generated license directory onto the
@@ -31,7 +31,7 @@ python do_populate_lic() {
31 destdir = os.path.join(bb.data.getVar('LICSSTATEDIR', d, True), pn) 31 destdir = os.path.join(bb.data.getVar('LICSSTATEDIR', d, True), pn)
32 # The license files are located in S/LIC_FILE_CHECKSUM. 32 # The license files are located in S/LIC_FILE_CHECKSUM.
33 srcdir = bb.data.getVar('S', d, True) 33 srcdir = bb.data.getVar('S', d, True)
34 # Directory we store the generic licenses as set in poky.conf 34 # Directory we store the generic licenses as set in the distro configuration
35 generic_directory = bb.data.getVar('COMMON_LICENSE_DIR', d, True) 35 generic_directory = bb.data.getVar('COMMON_LICENSE_DIR', d, True)
36 if not generic_directory: 36 if not generic_directory:
37 raise bb.build.FuncFailed("COMMON_LICENSE_DIR is unset. Please set this in your distro config") 37 raise bb.build.FuncFailed("COMMON_LICENSE_DIR is unset. Please set this in your distro config")
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index c2a072a329..a2b36bdbef 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -528,8 +528,7 @@ SRCPV = "${@bb.fetch2.get_srcrev(d)}"
528 528
529SRC_URI = "file://${FILE}" 529SRC_URI = "file://${FILE}"
530 530
531# We can choose which provider of fake root privileges to use 531# Use pseudo as the fakeroot implementation
532# default is fakeroot but in Poky we use pseudo
533PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" 532PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/"
534FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0" 533FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0"
535FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" 534FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}"
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index 271acc93ff..b9d9029d21 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -21,7 +21,7 @@ for device in 'hda' 'hdb' 'sda' 'sdb'
21 found="yes" 21 found="yes"
22 22
23 while true; do 23 while true; do
24 echo "Found drive at /dev/${device}. Do you want to install poky there ? [y/n]" 24 echo "Found drive at /dev/${device}. Do you want to install this image there ? [y/n]"
25 read answer 25 read answer
26 if [ "$answer" = "y" ] ; then 26 if [ "$answer" = "y" ] ; then
27 break 27 break
@@ -153,7 +153,7 @@ echo "(hd0) /dev/${device}" > /ssd/boot/grub/device.map
153 153
154echo "default 0" > /ssd/boot/grub/menu.lst 154echo "default 0" > /ssd/boot/grub/menu.lst
155echo "timeout 30" >> /ssd/boot/grub/menu.lst 155echo "timeout 30" >> /ssd/boot/grub/menu.lst
156echo "title Poky-Netbook" >> /ssd/boot/grub/menu.lst 156echo "title Live Boot/Install-Image" >> /ssd/boot/grub/menu.lst
157echo "root (hd0,0)" >> /ssd/boot/grub/menu.lst 157echo "root (hd0,0)" >> /ssd/boot/grub/menu.lst
158echo "kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet" >> /ssd/boot/grub/menu.lst 158echo "kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet" >> /ssd/boot/grub/menu.lst
159 159
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb
index cabdf8baf0..55dab8aaae 100644
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
@@ -26,7 +26,7 @@ inherit autotools
26BBCLASSEXTEND = "native" 26BBCLASSEXTEND = "native"
27 27
28EXTRA_OECONF = "--disable-selinux --with-pkgversion=${PV}-${PR} \ 28EXTRA_OECONF = "--disable-selinux --with-pkgversion=${PV}-${PR} \
29 --with-bugurl=http://bugzilla.pokylinux.org/" 29 --with-bugurl=http://bugzilla.yoctoproject.org/"
30 30
31do_configure_prepend () { 31do_configure_prepend () {
32 # Disable documentation! 32 # Disable documentation!