diff options
Diffstat (limited to 'poky/meta-poky')
-rw-r--r-- | poky/meta-poky/conf/distro/include/gcsections.inc | 2 | ||||
-rw-r--r-- | poky/meta-poky/conf/distro/poky-tiny.conf | 21 | ||||
-rw-r--r-- | poky/meta-poky/conf/distro/poky.conf | 16 | ||||
-rw-r--r-- | poky/meta-poky/conf/layer.conf | 2 | ||||
-rw-r--r-- | poky/meta-poky/conf/local.conf.sample | 12 | ||||
-rw-r--r-- | poky/meta-poky/conf/local.conf.sample.extended | 4 | ||||
-rw-r--r-- | poky/meta-poky/recipes-core/busybox/busybox/poky-tiny/defconfig | 2 |
7 files changed, 29 insertions, 30 deletions
diff --git a/poky/meta-poky/conf/distro/include/gcsections.inc b/poky/meta-poky/conf/distro/include/gcsections.inc index 886a005b34..a1f8651ae9 100644 --- a/poky/meta-poky/conf/distro/include/gcsections.inc +++ b/poky/meta-poky/conf/distro/include/gcsections.inc @@ -16,6 +16,8 @@ LDFLAGS_SECTION_REMOVAL:pn-grub = "" # SDK packages with build problems using sections CFLAGS_SECTION_REMOVAL:pn-nativesdk-glibc = "" LDFLAGS_SECTION_REMOVAL:pn-nativesdk-glibc = "" +CFLAGS_SECTION_REMOVAL:pn-nativesdk-cairo = "" +LDFLAGS_SECTION_REMOVAL:pn-nativesdk-cairo = "" CFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-runtime = "" LDFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-runtime = "" CFLAGS_SECTION_REMOVAL:pn-nativesdk-perl = "" diff --git a/poky/meta-poky/conf/distro/poky-tiny.conf b/poky/meta-poky/conf/distro/poky-tiny.conf index b6c4eeccd0..499af906a8 100644 --- a/poky/meta-poky/conf/distro/poky-tiny.conf +++ b/poky/meta-poky/conf/distro/poky-tiny.conf @@ -97,8 +97,7 @@ INIT_MANAGER ?= "mdev-busybox" # udev, grub, etc. These pull in gettext, which fails to build with wide # character support. IMAGE_FSTYPES = "cpio.gz" - -QB_DEFAULT_FSTYPE = "${IMAGE_FSTYPES}" +QB_DEFAULT_FSTYPE = "cpio.gz" # Drop v86d from qemu dependency list (we support serial) # Drop grub from meta-intel BSPs @@ -112,16 +111,14 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "" # this script for the purposes of tiny, remove the dependency from here. RDEPENDS:${PN}-mtrace:pn-eglibc = "" -PNBLACKLIST[build-appliance-image] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-base] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-full-cmdline] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-rt] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-rt-sdk] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-sato] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-sato-dev] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-sato-sdk] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-x11] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-weston] = "not buildable with poky-tiny" +SKIP_RECIPE[build-appliance-image] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-rt] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-rt-sdk] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-sato] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-sato-dev] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-sato-sdk] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-x11] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-weston] = "not buildable with poky-tiny" # Disable python usage in opkg-utils since it won't build with tiny config PACKAGECONFIG:remove:pn-opkg-utils = "python" diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index 2dc3606ae5..47ef9fa2ee 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -31,14 +31,14 @@ DISTRO_EXTRA_RRECOMMENDS += "${POKY_DEFAULT_EXTRA_RRECOMMENDS}" TCLIBCAPPEND = "" PREMIRRORS ??= "\ -bzr://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -cvs://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -git://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -gitsm://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -hg://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -osc://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -p4://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -svn://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n" +bzr://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \ +cvs://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \ +git://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \ +gitsm://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \ +hg://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \ +osc://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \ +p4://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \ +svn://.*/.* https://downloads.yoctoproject.org/mirror/sources/" SANITY_TESTED_DISTROS ?= " \ poky-3.3 \n \ diff --git a/poky/meta-poky/conf/layer.conf b/poky/meta-poky/conf/layer.conf index 2d49616cd9..f43c875c2a 100644 --- a/poky/meta-poky/conf/layer.conf +++ b/poky/meta-poky/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "yocto" BBFILE_PATTERN_yocto = "^${LAYERDIR}/" BBFILE_PRIORITY_yocto = "5" -LAYERSERIES_COMPAT_yocto = "honister" +LAYERSERIES_COMPAT_yocto = "kirkstone" # This should only be incremented on significant changes that will # cause compatibility issues with other layers diff --git a/poky/meta-poky/conf/local.conf.sample b/poky/meta-poky/conf/local.conf.sample index 7bdbba06b1..55e90e008e 100644 --- a/poky/meta-poky/conf/local.conf.sample +++ b/poky/meta-poky/conf/local.conf.sample @@ -184,7 +184,7 @@ PATCHRESOLVE = "noop" # # Monitor the disk space during the build. If there is less that 1GB of space or less # than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort +# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard halt # of the build. The reason for this is that running completely out of space can corrupt # files and damages the build in ways which may not be easily recoverable. # It's necessary to monitor /tmp, if there is no space left the build will fail @@ -194,10 +194,10 @@ BB_DISKMON_DIRS ??= "\ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ STOPTASKS,/tmp,100M,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K \ - ABORT,/tmp,10M,1K" + HALT,${TMPDIR},100M,1K \ + HALT,${DL_DIR},100M,1K \ + HALT,${SSTATE_DIR},100M,1K \ + HALT,/tmp,10M,1K" # # Shared-state files from other locations @@ -214,7 +214,7 @@ BB_DISKMON_DIRS ??= "\ # at the end as shown in the examples below. This will be substituted with the # correct path within the directory structure. #SSTATE_MIRRORS ?= "\ -#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ +#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \ #file://.* file:///some/local/dir/sstate/PATH" # diff --git a/poky/meta-poky/conf/local.conf.sample.extended b/poky/meta-poky/conf/local.conf.sample.extended index 8a384540f9..bc2dec9f52 100644 --- a/poky/meta-poky/conf/local.conf.sample.extended +++ b/poky/meta-poky/conf/local.conf.sample.extended @@ -177,7 +177,7 @@ DISTRO_FEATURES:remove = "x11" # product. If shipped as part of an image these packages may have # implications so they are disabled by default. To enable them, # un-comment the below as appropriate. -#LICENSE_FLAGS_WHITELIST = "commercial_gst-fluendo-mp3 \ +#LICENSE_FLAGS_ACCEPTED = "commercial_gst-fluendo-mp3 \ # commercial_gst-openmax \ # commercial_gst-plugins-ugly \ # commercial_lame \ @@ -195,7 +195,7 @@ DISTRO_FEATURES:remove = "x11" # "action,directory,minimum_space,minimum_free_inode" # # The "action" must be set and should be one of: -# ABORT: Immediately abort +# HALT: Immediately halt # STOPTASKS: The new tasks can't be executed any more, will stop the build # when the running tasks have been done. # WARN: show warnings (see BB_DISKMON_WARNINTERVAL for more information) diff --git a/poky/meta-poky/recipes-core/busybox/busybox/poky-tiny/defconfig b/poky/meta-poky/recipes-core/busybox/busybox/poky-tiny/defconfig index b0fb88a0c1..6e9faa4119 100644 --- a/poky/meta-poky/recipes-core/busybox/busybox/poky-tiny/defconfig +++ b/poky/meta-poky/recipes-core/busybox/busybox/poky-tiny/defconfig @@ -1160,7 +1160,7 @@ CONFIG_CTTYHACK=y # # Options common to all shells # -# CONFIG_FEATURE_SH_MATH is not set +CONFIG_FEATURE_SH_MATH=y # CONFIG_FEATURE_SH_MATH_64 is not set # CONFIG_FEATURE_SH_MATH_BASE is not set CONFIG_FEATURE_SH_EXTRA_QUIET=y |