* number of TUNE_CCARGS conditionals is important if we add
extra space with each one in "else" branch
I'm building for 2 MACHINEs one is cortexa9, second is cortexa8
few months ago we added TUNE_CCARGS[vardepvalue] in bitbake.conf
http://git.openembedded.org/openembedded-core/commit/?id=03f1e34ea3ce80931e9c3cd2ab22824f28a7233b
which fixed some cases (like mentioned tune-xscale and tune-arm926ejs)
where both had unused TUNE_CCARGS when common DEFAULTTUNE was used.
with cortexa[89] it's different, because cortexa9 has one extra TUNE_CCARGS
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "cortexa9", "-mtune=cortex-a9", "", d)}"
which adds extra *space* even when not used because of '+=' and as result:
$ bitbake-diffsigs tmp-eglibc/sstate-diff/1366797730/*/armv7*/adapterbase/*do_configure*
basehash changed from f986789fb8fb3579ed6a3492cc8a8d10 to c851b5f838d945ee13072e9ad6725dca
Variable TUNE_CCARGS value changed from
' -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon '
to
' -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon '
Hash for dependent task gcc-runtime_4.7.bb.do_populate_sysroot changed from bdeabf7a86958b9110b566344b7916de to 2be5618e6bc8c57ec9db5659bf217915
Hash for dependent task eglibc_2.17.bb.do_populate_sysroot changed from b4f40fc62dde684acd0a574532a55360 to 97fcb426603d4a1c1099c0504d2ebf7d
Hash for dependent task glib-2.0_2.34.3.bb.do_populate_sysroot changed from fd2f90b83098c34e88d649d70f6ea4f5 to ebd740bb94ea3eb0a914efda6fc82c4a
(From OE-Core master rev: b7430ff83760ac29079d20dc7c62f498a0a9d55d)
(From OE-Core rev: 6a9873477faea55a8e8d59a431b8f3c928a2c871)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Don't add the first line of /etc/rpm/platform to the list of patterns
to match when computing an arch score, use it just for getting
information about the platform (cpu/vendor/os).
[YOCTO #3864]
(From OE-Core master rev: 9263a2192ccf8ca513cbf7f2f88473e267e6b945)
(From OE-Core rev: 057217ddece60609a97e32a4143618d2f2b42db0)
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With normal toolchain it works. But fails badly when external Linaro
toolchain is used. And this is why:
-e "s/^\(CCFLAGS =.*\)/\1 -isystem/home/hrw/devel/canonical/aarch64/openembedded/build/linaro-tcwg/gcc-linaro-aarch64-linux-gnu-4.7-2013.04-20130415_linux//aarch64-linux-gnu/include -O2 -pipe -g -feliminate-unused-debug-types/" \
(From OE-Core master rev: f6244a9d3da7c301f19efc114c2aaf39e5eec299)
(From OE-Core rev: bb94a3fbdd9b10fcece73798e7a40ff211ebbd5c)
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Old script failed to parse unit files containing comments like
| #Alias=some-alias
or whitespaces like
| WantedBy = foo
correctly. Patch changes script to interpret keywords only when they
are at the beginning of a line and ignores whitespaces before the '='.
(From OE-Core master rev: 443e75ee2c0e9a62df997aef24855bce54d39177)
(From OE-Core rev: 7a8205e28d4bc826b0dc3f692a958e1e8e9a1432)
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The timestamps in libxslt-1.1.28.tar.gz (specifically) are rather hokey, making
the source files for the documentation appear newer than the generated output:
-rw-rw-r-- 500/500 16307 2012-11-21 07:22 libxslt-1.1.28/doc/xsltproc.xml
-rw-rw-r-- 500/500 7082 2012-09-12 07:24 libxslt-1.1.28/doc/xsltproc2.html
-rw-rw-r-- 500/500 9475 2012-09-04 15:26 libxslt-1.1.28/doc/xsltproc.html
-rw-rw-r-- 500/500 8256 2012-11-21 06:03 libxslt-1.1.28/doc/xsltproc.1
This causes make to decide that xsltproc.1 needs to be regenerated during the
installation process. However, this requires a native xsltproc binary which
may not be available, leading to errors like:
| make[2]: /usr/bin/xsltproc: Command not found
| make[2]: [xsltproc.1] Error 127 (ignored)
Adding DEPENDS_class-target = "libxslt-native", or installing xsltproc in the
host environment, fixes the above but the documentation still doesn't build:
| I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
| warning: failed to load external entity "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"
| error
| xsltParseStylesheetFile : cannot parse http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
| compilation error: file ./xsltproc.xml line 10 element refentry
| xsltParseStylesheetProcess : document is not a stylesheet
And in any case, requiring libxslt-native would increase build time for no
real benefit. So, let's just adjust the timestamp on the shipped copy of
xsltproc.1 to make it appear newer than the source files.
(From OE-Core master rev: 12074bf5319c1086f86efd00f502c91fed344698)
(From OE-Core rev: c234dadb606544c552074aef3484f86f383b52df)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If it's not first boot, /tmp has already been symlinked to /var/volatile/tmp.
But the udev service starts before populate-volatile.sh starts. This leads to
a dead link at /tmp. As a result, trying to create any file under /tmp will
fail.
If a USB is plugged in before the populate-volatile.sh script starts, the
/tmp/.automount-$name file will not be created correctly. As a result, when
the USB is unplugged, the /media/$name directory is not removed.
So we create /var/volatile/tmp directory in the udev script to avoid this dead
link problem.
[YOCTO #3404]
(From OE-Core master rev: 2f93c8466ca146c965585ea38210ddb5fb5754bd)
(From OE-Core rev: 78d44b0025a2fc117b67f8128385d0387955f01c)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Depending on kernel version used, the system can hung when trying to
mount the extended partition (not the logical one) as it is a holder
for other partitions and does not have a filesystem in it.
To avoid this to happen we just mount partitions when these are using
known filesystems so it does not try to mount a partition for an
unsupported filesystem.
Reported-by: Vladan Jovanovic <vladan.jovanovic@gmail.com>
Reported-by: Leonardo Sandoval Gonzalez <b42214@freescale.com>
(From OE-Core master rev: 895c9685a7f95dc84786213f945895a504a16254)
(From OE-Core rev: cdb8ccc8f9b4959e84d1ee071de29e8a54974c11)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Tested-by: Vladan Jovanovic <vladan.jovanovic@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without disabling the tests in the native build, glib-2.0-native will need
libdbus-native to be present. As we don't run the tests, disable them so we
don't have build failures due to missing dependencies.
Also, the LSB override was missing PTEST_CONF so the same problem could happen.
After adding PTEST_CONF the LSB override is identical to the non-overridden
EXTRA_OECONF, so remove it.
Finally, to be explicit, put --enable-module-tests in PTEST_CONF.
(From OE-Core master rev: 395b90054eccddc1c9062a9a8657ed4482b7710a)
(From OE-Core rev: ab4309f4769724b7b778d04b6882172ae95311e9)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These data files are required for module-alsa-card to load properly
(From OE-Core master rev: 8dda0dc79f5c90f8d40450ba6215f44edcbacb8f)
(From OE-Core rev: 5c45a53f773d7dd266c622a4464c49a1286d4432)
Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
O irony: the grub2/gnulib nag macro that says "don't use gets, use fgets" breaks the build if you're using a recent (e)glibc release that has gets removed.
Fedora already #if 0's the check in grub, so I stole their patch.
(From OE-Core master rev: 261e377b08388a288ee521a3629877b89e18e42b)
(From OE-Core rev: 48fb1f19875cac24cb990807523f6e513c7031aa)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Due to some issues with postinstalls that register hooks, we changed the
logic a bit. Now, all postinstalls that register hooks will return
successfully and only after, if hooks fail, mark the package as unpacked.
(From OE-Core master rev: 82dae98d0eb771c05e57635f0f8763b118d8177e)
(From OE-Core rev: 202f1b0e4ee6d912f2bec5991d1cd60bbb0c020e)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This will allow to register, in a single postinstall, multiple hooks.
(From OE-Core master rev: b396138ee081c8f5dddbaab0e374787ba2e31029)
(From OE-Core rev: 3daed9c994d3f092caa9cc6e8bab49ab606cb0a2)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This will allow to register, in a single postinstall, multiple hooks.
(From OE-Core master rev: 2cd244d6c93ec6d39e2649de64575c365bd4238d)
(From OE-Core rev: 982302219bf5b133f76a0d8213b626f8abef99b3)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This will allow to register, in a single postinstall, multiple hooks.
(From OE-Core master rev: 9553874cf02ba443aff1bbead56bacfcda9bb6ca)
(From OE-Core rev: 3ef3b5be29925d8b6579c5bd57e58ce1bced35d8)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Take __BBTASKS, __BBHANDLERS and __BBANONFUNCS into account when
computing the configuration hash.
[YOCTO #4447]
(Bitbake master rev: 260ced7452405fc43ce3d9dd6798236aa07cc716)
(Bitbake rev: 0c744479c2657e433280d9f1884483fa76796b69)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Current if the PR Service fails to start, bitbake carries on regardless or
hangs with no error message. This adds an exception and then handles it correctly
so the UIs correctly handle the error and exit cleanly.
[YOCTO #4010]
(Bitbake master rev: 949c01228a977c3b92bfc0802f6c71b40d8e05b3)
(Bitbake rev: c21c3fd3adc7bbbd7018a03e99f058b05bec10b2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
runCommand was returning 'error' but checking for 'err'
resulting in an exception.
(Bitbake master rev: 263aa44ed47e0cb03e1a97e7ed4a50bd9f828c78)
(Bitbake rev: ea7254390807d6d4a34bd07ebe33b381de462ced)
Signed-off-by: Martin Donnelly <martin.donnelly@ge.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
powertop uses gettext during config time and at build time to generate the
messages, so really should inherit gettext.
[YOCTO #4470]
(From OE-Core rev: 8ca272168e3cf9abcab13096a3c4eaadb7e35841)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The shutdown sanity test that we previously saw on qemux86-64 in 2.6.37 have
started to re-appear reproducably on qemux86 in 3.4 in the Danny series. Until
this can be root-caused and fixed in the kernel, disable paravirtualisation
across all kernels and all qemu machines.
[ YOCTO #4196 ]
(From OE-Core rev: a8c61372b9701bc23b7071499ff2148455d46c84)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The postinstall needs to reference $D, not ${D} which would get expanded
by bitbake. This allows postinsts to run correctly on the target system.
(From OE-Core rev: 6573685a5374034df065c41bbe71c7ac49e4b9a4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If we want systemd support we use systemd's udev, so disable systemd
support in this udev to avoid packaging the unit files.
(From OE-Core rev: 36aa37e693bcb76a96761847dbef6a015d96fd98)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
libudev previously depended on udev, but this causes problems with multilib
if the user wants to install two variants of libudev as they'll pull in two
variants of udev, which will conflict.
Instead, remove the dependency and rely that the image pulls in udev in some
way, such as the commonly used packagegroup-core-boot.
(From OE-Core rev: 6168ea4e00fd1c8296fe770fa9e2ef00018f5621)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Apparently, the default qemumips color depth was set to 8 and the colors were not
displayed properly. cirrusfb driver doensn't seem to accept color depth
as a kernel parameter, so we have to do it here.
[YOCTO #4340]
(From OE-Core rev: 876e020be334a9350094dbd1a29b9e49eceed603)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The do_populate_lic task has a race with the recipe since it relies on the
kernel being populated in the sysroot. This patch adds in the explicit missing
dependency.
[YOCTO #3534]
(From OE-Core rev: 578937213c6db9fa99981778ce61210e391b19a7)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The update-alternatives for multilibs are broken and nothing provides psplash in a
multilib build. This fixes the multilib code.
(From OE-Core rev: db1f6b24ddb2a19fb16b2ebb948bb3274b7ac295)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The postinstall for the opkg run-postinst hook checks for the existence of this
file. We therefore ensure it always exists during image generation.
(From OE-Core rev: 540cf355599e555615ed9684c3b480463588eb78)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
THe USERADD_PARAMS and similar group variables are package specific variables
which should get added to the vardeps of the packaging process. This
change also ensures they get remapped correctly by the multilib code.
(From OE-Core rev: 805add18e7b917aaef61c82c0b5f2e9682af1d0d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If we don't do this, multilib packages don't have any code
added to the postinstalls to handle user additions.
(From OE-Core rev: b10d17d1b03fd0564103a6998f218d0968d1032b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Otherwise this setting "floats" and leads to non-determinstic builds.
(From OE-Core rev: 4eea01e9d775f2e56958a8bb194aadd8a242946d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With the splite of netbase and init-ifupdown, the interfaces file needs to get
moved for the beagleboard
[YOCTO #4334]
(From meta-yocto rev: 8f3ed8620d7df41d30abebd472f0b92933f64fed)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Commit http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=f76d4b3549ca220fa4bf84db2756ab45e11d06a3
moved volatiles handling for /run to the udev code only. This breaks
sysvinit+systemd combined systems when building sysvinit images.
This patch hacks the udevd init script in systemd to provide
the missing symlink allowing the sysvinit images built with udevd
from systemd to work correctly.
(From OE-Core rev: 6c6e5dc0baccd0904f785b1f80f39b5f530779cf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use ${PN} when specifing service files so that they continue to get packaged
with multilib.
(From OE-Core rev: d394d27b66cbeb4e57017d2a49605243586477ac)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When libdir isn't /lib the files that are in nonarch_base_libdir were being left
out of the -dbg package.
(From OE-Core rev: 60bb2f795a0b3e83de5861185446992fb91ffba0)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Previously this was using ${PN}-syslog.service, which changes with multilib.
(From OE-Core rev: ee36f997e68f5a995baf361191cef7a46ff51203)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When using multilib this doesn't get caught by the default FILES_${PN}, so add
it.
(From OE-Core rev: 53f1540780e5d4e8035118a1920202735bd0a370)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This effectively reverts the move systemd's libexecdir to /sbin. This caused
too many issues in other places and was not well enough tested this close to
release.
Rather than use base_libdir, the nonarch version is used to try and give some
chance of multilib not being totally broken in the release. Also some variables
are used that mirror the systemd build system to reduce the risk of using
variables that "work" in the general case but will break with multilib.
(From OE-Core rev: e921d43e213f93da176fd27e48b557f802443dec)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently, you can set VIRTUAL-RUNTIME_init_manager to an init system that
isn't in DISTRO_FEATURES. This leads to head scratching over unbootable images.
This adds a sanity check which ensures more valid systems are built.
(From OE-Core rev: c72ec4b52827f75351790eab483d258b2e87611a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This effectively reverts the changes made in b49ddeb11c
to move udev's libexecdir to sbin. The changes caused too many issues in
other places and were not well enough tested this close to a release.
Rather than use base_libdir, the nonarch version is used to try and give some
chance of multilib not being totally broken in the release.
(From OE-Core rev: c50e50fdafad378d75b7b74259a3d55ca0fe3d18)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If we put a valid glob like "*/foo/*" into FILES, populate_packages
breaks with a "file exists" message. This is because the glob expansion
does not have "./" prefix however there may already be an entry in
the seen list which does have such a prefix. The easiest/simplest fix
right now is to add the prefix if it doesn't exist which only happens
for certain globs.
(From OE-Core rev: 138c5f3af892e33f576fc7dd268e122b179f82a1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
