diff options
| -rw-r--r-- | README.aspeed-build | 20 | ||||
| -rw-r--r-- | local-aspeed.conf | 250 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 6 | ||||
| -rw-r--r-- | meta/recipes-devtools/perl/perl-ptest.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-devtools/pseudo/pseudo/pseudo-glibc-rtld-next-workaround.patch | 85 | ||||
| -rw-r--r-- | meta/recipes-devtools/pseudo/pseudo_1.6.4.bb | 1 |
6 files changed, 361 insertions, 5 deletions
diff --git a/README.aspeed-build b/README.aspeed-build new file mode 100644 index 0000000..ffaa17f --- /dev/null +++ b/README.aspeed-build @@ -0,0 +1,20 @@ +# =============================================================================================== +# System requirements +# =============================================================================================== +Debian Stretch +gcc5 (gcc6 doesn't work at this time) + +# =============================================================================================== +# Workarounds +# =============================================================================================== + * Restore /etc/perl/find.pl per http://blog.kempj.co.uk/2015/09/missing-find-pl-compiling-oe/ + * Copy the provided local-aspeed.conf file into build/conf/local.conf after bitbake fails, then + retry bitbake + +# =============================================================================================== +# General build procedure +# =============================================================================================== +export TEMPLATECONF=meta-openbmc/meta-raptor/meta-asus/conf +source oe-init-build-env +cp -Rp ../local-aspeed.conf conf/local.conf +bitbake asus-image diff --git a/local-aspeed.conf b/local-aspeed.conf new file mode 100644 index 0000000..80aec16 --- /dev/null +++ b/local-aspeed.conf @@ -0,0 +1,250 @@ +# +# This file is your local configuration file and is where all local user settings +# are placed. The comments in this file give some guide to the options a new user +# to the system might want to change but pretty much any configuration option can +# be set in this file. More adventurous users can look at local.conf.extended +# which contains other examples of configuration which can be placed in this file +# but new users likely won't need any of them initially. +# +# Lines starting with the '#' character are commented out and in some cases the +# default values are provided as comments to show people example syntax. Enabling +# the option is a question of removing the # character and making any change to the +# variable as required. + +# +# Machine Selection +# +# You need to select a specific machine to target the build with. There are a selection +# of emulated machines available which can boot and run in the QEMU emulator: +# +#MACHINE ?= "qemuarm" +#MACHINE ?= "qemuarm64" +#MACHINE ?= "qemumips" +#MACHINE ?= "qemuppc" +#MACHINE ?= "qemux86" +#MACHINE ?= "qemux86-64" +# +# There are also the following hardware board target machines included for +# demonstration purposes: +# +#MACHINE ?= "beaglebone" +#MACHINE ?= "genericx86" +#MACHINE ?= "genericx86-64" +#MACHINE ?= "mpc8315e-rdb" +#MACHINE ?= "edgerouter" +# +# This sets the default machine to be qemux86 if no other machine is selected: +#MACHINE ??= "qemux86" + +MACHINE ?= "asus" + +# +# Where to place downloads +# +# During a first build the system will download many different source code tarballs +# from various upstream projects. This can take a while, particularly if your network +# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you +# can preserve this directory to speed up this part of subsequent builds. This directory +# is safe to share between multiple builds on the same machine too. +# +# The default is a downloads directory under TOPDIR which is the build directory. +# +#DL_DIR ?= "${TOPDIR}/downloads" + +# +# Where to place shared-state files +# +# BitBake has the capability to accelerate builds based on previously built output. +# This is done using "shared state" files which can be thought of as cache objects +# and this option determines where those files are placed. +# +# You can wipe out TMPDIR leaving this directory intact and the build would regenerate +# from these files if no changes were made to the configuration. If changes were made +# to the configuration, only shared state files where the state was still valid would +# be used (done using checksums). +# +# The default is a sstate-cache directory under TOPDIR. +# +#SSTATE_DIR ?= "${TOPDIR}/sstate-cache" + +# +# Where to place the build output +# +# This option specifies where the bulk of the building work should be done and +# where BitBake should place its temporary files and output. Keep in mind that +# this includes the extraction and compilation of many applications and the toolchain +# which can use Gigabytes of hard disk space. +# +# The default is a tmp directory under TOPDIR. +# +#TMPDIR = "${TOPDIR}/tmp" + +# +# Default policy config +# +# The distribution setting controls which policy settings are used as defaults. +# The default value is fine for general Yocto project use, at least initially. +# Ultimately when creating custom policy, people will likely end up subclassing +# these defaults. +# +DISTRO ?= "poky" +# As an example of a subclass there is a "bleeding" edge policy configuration +# where many versions are set to the absolute latest code from the upstream +# source control systems. This is just mentioned here as an example, its not +# useful to most new users. +# DISTRO ?= "poky-bleeding" + +# +# Package Management configuration +# +# This variable lists which packaging formats to enable. Multiple package backends +# can be enabled at once and the first item listed in the variable will be used +# to generate the root filesystems. +# Options are: +# - 'package_deb' for debian style deb files +# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) +# - 'package_rpm' for rpm style packages +# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" +# We default to rpm: +PACKAGE_CLASSES ?= "package_rpm" + +# +# SDK/ADT target architecture +# +# This variable specifies the architecture to build SDK/ADT items for and means +# you can build the SDK packages for architectures other than the machine you are +# running the build on (i.e. building i686 packages on an x86_64 host). +# Supported values are i686 and x86_64 +#SDKMACHINE ?= "i686" + +# +# Extra image configuration defaults +# +# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated +# images. Some of these options are added to certain image types automatically. The +# variable can contain the following options: +# "dbg-pkgs" - add -dbg packages for all installed packages +# (adds symbol information for debugging/profiling) +# "dev-pkgs" - add -dev packages for all installed packages +# (useful if you want to develop against libs in the image) +# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages +# (useful if you want to run the package test suites) +# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) +# "tools-debug" - add debugging tools (gdb, strace) +# "eclipse-debug" - add Eclipse remote debugging support +# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) +# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) +# "debug-tweaks" - make an image suitable for development +# e.g. ssh root access has a blank password +# There are other application targets that can be used here too, see +# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. +# We default to enabling the debugging tweaks. +EXTRA_IMAGE_FEATURES = "debug-tweaks" + +# +# Additional image features +# +# The following is a list of additional classes to use when building images which +# enable extra features. Some available options which can be included in this variable +# are: +# - 'buildstats' collect build statistics +# - 'image-mklibs' to reduce shared library files size for an image +# - 'image-prelink' in order to prelink the filesystem image +# - 'image-swab' to perform host system intrusion detection +# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink +# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended +USER_CLASSES ?= "buildstats image-mklibs image-prelink" + +# +# Runtime testing of images +# +# The build system can test booting virtual machine images under qemu (an emulator) +# after any root filesystems are created and run tests against those images. To +# enable this uncomment this line. See classes/testimage(-auto).bbclass for +# further details. +#TEST_IMAGE = "1" +# +# Interactive shell configuration +# +# Under certain circumstances the system may need input from you and to do this it +# can launch an interactive shell. It needs to do this since the build is +# multithreaded and needs to be able to handle the case where more than one parallel +# process may require the user's attention. The default is iterate over the available +# terminal types to find one that works. +# +# Examples of the occasions this may happen are when resolving patches which cannot +# be applied, to use the devshell or the kernel menuconfig +# +# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none +# Note: currently, Konsole support only works for KDE 3.x due to the way +# newer Konsole versions behave +#OE_TERMINAL = "auto" +# By default disable interactive patch resolution (tasks will just fail instead): +PATCHRESOLVE = "noop" + +# +# Disk Space Monitoring during the build +# +# 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 that 100MB or 1K inodes, perform a hard abort +# 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. +BB_DISKMON_DIRS = "\ + STOPTASKS,${TMPDIR},1G,100K \ + STOPTASKS,${DL_DIR},1G,100K \ + STOPTASKS,${SSTATE_DIR},1G,100K \ + ABORT,${TMPDIR},100M,1K \ + ABORT,${DL_DIR},100M,1K \ + ABORT,${SSTATE_DIR},100M,1K" + +# +# Shared-state files from other locations +# +# As mentioned above, shared state files are prebuilt cache data objects which can +# used to accelerate build time. This variable can be used to configure the system +# to search other mirror locations for these objects before it builds the data itself. +# +# This can be a filesystem directory, or a remote url such as http or ftp. These +# would contain the sstate-cache results from previous builds (possibly from other +# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the +# cache locations to check for the shared objects. +# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH +# 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://.* file:///some/local/dir/sstate/PATH" + + +# +# Qemu configuration +# +# By default qemu will build with a builtin VNC server where graphical output can be +# seen. The two lines below enable the SDL backend too. This assumes there is a +# libsdl library available on your build system. +#PACKAGECONFIG_append_pn-qemu-native = " sdl" +#PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" +#ASSUME_PROVIDED += "libsdl-native" + + +# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to +# track the version of this file when it was generated. This can safely be ignored if +# this doesn't mean anything to you. +CONF_VERSION = "1" + +# Update root password to '0penBmc' and change the root shell back to bash. +# This default root password is used at the ODM and system integrator. It will be +# changed during provisioning at the datacenter. +INHERIT += "extrausers" + +EXTRA_USERS_PARAMS = " \ + usermod -s /bin/bash root; \ + usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ + " + +OLDEST_KERNEL = "2.6.28" + +INHERIT += "blacklist" +PNBLACKLIST[glibc] = "glibc 2.21 does not work with our kernel 2.6.28" + diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 2b3c110..b086cc9 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -485,10 +485,10 @@ PATCHRESOLVE = 'user' # Build flags and options. ################################################################## -export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}" -BUILDSDK_CPPFLAGS = "-isystem${STAGING_INCDIR}" +export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE} -Wno-nonnull-compare -Wno-misleading-indentation -Wno-shift-negative-value -Wno-unused-const-variable -Wno-unused-but-set-variable" +BUILDSDK_CPPFLAGS = "-isystem${STAGING_INCDIR} -Wno-nonnull-compare -Wno-misleading-indentation -Wno-shift-negative-value -Wno-unused-const-variable -Wno-unused-but-set-variable" export CPPFLAGS = "${TARGET_CPPFLAGS}" -export TARGET_CPPFLAGS = "" +export TARGET_CPPFLAGS = "-Wno-nonnull-compare -Wno-misleading-indentation -Wno-shift-negative-value -Wno-unused-const-variable -Wno-unused-but-set-variable" #export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${includedir}" export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}" diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc index 948ea7c..5f0989f 100644 --- a/meta/recipes-devtools/perl/perl-ptest.inc +++ b/meta/recipes-devtools/perl/perl-ptest.inc @@ -7,8 +7,8 @@ do_install_ptest () { mkdir -p ${D}${PTEST_PATH} sed -e "s:\/opt:\/usr:" -i Porting/add-package.pl sed -e "s:\/local\/gnu\/:\/:" -i hints/cxux.sh - tar -cf - * --exclude \*.o --exclude libperl.so --exclude Makefile --exclude makefile --exclude hostperl \ - --exclude miniperl --exclude generate_uudmap --exclude patches | ( cd ${D}${PTEST_PATH} && tar -xf - ) + tar -c --exclude=\*.o --exclude=libperl.so --exclude=Makefile --exclude=makefile --exclude=hostperl \ + --exclude=miniperl --exclude=generate_uudmap --exclude=patches * | ( cd ${D}${PTEST_PATH} && tar -x ) sed -i -e "s,${D},,g" \ -e "s,--sysroot=${STAGING_DIR_HOST},,g" \ diff --git a/meta/recipes-devtools/pseudo/pseudo/pseudo-glibc-rtld-next-workaround.patch b/meta/recipes-devtools/pseudo/pseudo/pseudo-glibc-rtld-next-workaround.patch new file mode 100644 index 0000000..6710734 --- /dev/null +++ b/meta/recipes-devtools/pseudo/pseudo/pseudo-glibc-rtld-next-workaround.patch @@ -0,0 +1,85 @@ +We started seeing: + +No real function for mknod: /home/paul/poky_sdk/tmp/sysroots/x86_64- +linux/usr/bin/../lib/pseudo/lib64/libpseudo.so: undefined symbol: mknod +No real function for mknodat: /home/paul/poky_sdk/tmp/sysroots/x86_64- +linux/usr/bin/../lib/pseudo/lib64/libpseudo.so: undefined symbol: mknodat + +In glibc 2.24 they've merged: + +https://sourceware.org/git/?p=glibc.git;a=commit;h=7d45c163d00c88d5875a112343c4ea3e61349e6b +related to bugzilla entry: +https://sourceware.org/bugzilla/show_bug.cgi?id=19509 + +which means that the behaviour of RTLD_NEXT is slightly different. +As far as I can tell, mknod has not been present in glibc for a while. +To quote stat.h: + +/* To allow the `struct stat' structure and the file type `mode_t' + bits to vary without changing shared library major version number, + the `stat' family of functions and `mknod' are in fact inline + wrappers around calls to `xstat', `fxstat', `lxstat', and `xmknod', + which all take a leading version-number argument designating the + data structure and bits used. <bits/stat.h> defines _STAT_VER with + the version number corresponding to `struct stat' as defined in + that file; and _MKNOD_VER with the version number corresponding to + the S_IF* macros defined therein. It is arranged that when not + inlined these function are always statically linked; that way a + dynamically-linked executable always encodes the version number + corresponding to the data structures it uses, so the `x' functions + in the shared library can adapt without needing to recompile all + callers. */ + +so I suspect mknod has not existed for a while, if ever and what we +were finding, who knows. Everying in the system links against _xmknod +which we have a separate wrapper for. + +Anyhow, ignoring that problem which hasn't caused a issue in the past, +the RTLD_NEXT change causes messages to be printed to stdout which causes +carnage if for example the packaging code is expecting a list of packages: + +WARNING: core-image-minimal-1.0-r0 do_rootfs: No not found in the base feeds (qemux86_64 core2-64 x86_64 noarch any all). +WARNING: core-image-minimal-1.0-r0 do_rootfs: real not found in the base feeds (qemux86_64 core2-64 x86_64 noarch any all). +WARNING: core-image-minimal-1.0-r0 do_rootfs: function not found in the base feeds (qemux86_64 core2-64 x86_64 noarch any all). +WARNING: core-image-minimal-1.0-r0 do_rootfs: for not found in the base feeds (qemux86_64 core2-64 x86_64 noarch any all). +WARNING: core-image-minimal-1.0-r0 do_rootfs: mknod: not found in the base feeds (qemux86_64 core2-64 x86_64 noarch any all). +[etc] + +This bug will affect: +* any distro using glibc 2.24 +* any system using a uninative tarball for glibc 2.24 +* any system which took a backport for the fix which was merged into + the 2.23 branch for a while before it was reverted (Fedora 23 had this) + +The easiest thing to do is to ignore the problem and disable the diag +message which masks the problem with no ill effects. + +As Peter notes, there are a few issues here: + +* the fact there is no mknod symbol +* the fact an error here isn't fatal +* the #ifdef/#else looks suspect +* handle RTLD_NEXT chaining properly (need more libs?) + +which he'll work on upstream and hopefully have fixed in a new version. + +Upstream-Status: Submitted [Peter is aware of the issue] + +RP 2016/5/18 + +Index: pseudo-1.7.5/pseudo_wrappers.c +=================================================================== +--- pseudo-1.7.5.orig/pseudo_wrappers.c ++++ pseudo-1.7.5/pseudo_wrappers.c +@@ -146,9 +146,9 @@ pseudo_init_one_wrapper(pseudo_function + return; + } + #else +- if (e != NULL) { ++ /*if (e != NULL) { + pseudo_diag("No real function for %s: %s\n", func->name, e); +- } ++ }*/ + #endif + } + } diff --git a/meta/recipes-devtools/pseudo/pseudo_1.6.4.bb b/meta/recipes-devtools/pseudo/pseudo_1.6.4.bb index 3d5b1fb..9bc1738 100644 --- a/meta/recipes-devtools/pseudo/pseudo_1.6.4.bb +++ b/meta/recipes-devtools/pseudo/pseudo_1.6.4.bb @@ -4,6 +4,7 @@ SRC_URI = " \ http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \ file://fallback-passwd \ file://fallback-group \ + file://pseudo-glibc-rtld-next-workaround.patch \ " SRC_URI[md5sum] = "2fb800c90d643bfce55e1ce5ca67f3b3" |
