In the rpm2cpio.sh script, the output of $COMPRESSION is tested for
certain lowercase strings such as 'xz' in order to determine the
decompression to use. The problem is that the output strings tested
are from the output of 'file', which uses different cases in different
versions e.g. file-5.09 prints:
tmp/sysroots/x86_64-linux/usr/bin$ ./file xxx.tar.xz: XZ compressed data
while file-5.03 prints:
tmp/sysroots/x86_64-linux/usr/bin$ ./file xxx.tar.xz: xz compressed data
In the former, the XZ string causes xz compressed payloads to
incorrectly fall through to the catch-all lzma case.
(From OE-Core rev: fe48e55988a2208bb7a3a2cc2bc641c41dbd1cb0)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Unfortunately we now have code in BitBake which is parsed before the
current version check and is incompatible with Python < 2.6. Rather than
fixing this and being eternally vigilant for >= 2.6 feature usage, just
add a version check to the wrapper script.
(From OE-Core rev: 9b8a48efa3b80fea34efa51de44d10ff2b1e3193)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If /dev/net/tun is either not present or is not writable by the
user, then show an appropriate error message. (QEMU needs access to this
device in order to enable networking; it may be missing if it is not
enabled or loaded into the kernel, and some distributions such as CentOS
5.x set restrictive permissions upon it.)
(From OE-Core rev: a00b94900d437828f25debce1c30ffcc0bbf29e9)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
s/No cover letter will be send./No cover letter will be sent./
(From OE-Core rev: a82e5abf399f3ced7dcb4d5c543fdea084ef6c63)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without this the command will add a route for the subnet 192.168.7.0 which
means multiple qemu instances can't operate correctly since all but the last
one will be masked out.
(From OE-Core rev: 9e00d6b343120496ec0dd72240c7b04e0a8b7eaa)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We can't just look for *image* since it will catch up bzimage
(From OE-Core rev: c2f88c658b73da67d93312591b3e67b42f629fe3)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Current sanitytest use option -e for ps command, which only works for ps
from procps. It fails if ps is provided by busybox. Add check to use different
option for command from busybox and procps.
[YOCTO #1756]
(From OE-Core rev: dd856f5609c13fc740b53016de033a8a9cbe6b51)
Signed-off-by: Jiajun Xu <jiajun.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* move 2to3 to separate package and include lib2to3 (was in python-misc)
* fix pattern for python-unittest (was in python-misc because it's in subdirectory now)
* add pydoc_data to python-pydoc (was in python-misc)
* add more stuff to smtpd, audio, codecs, ctypes, html, io, json, mime,
pickle, stringold, xmlrpc
* move all FILES_ details from python recipe to manifest generator so it's in one place
* added manual line break in FILES_${PN}-core, because git send-email
doesn't like too long lines
$ git send-email -1 dfaae65839f0ab23e5b2ae2a68df0f370bca84d2
fatal: /tmp/k8zbDajUNP/0001-python-improve-packaging.patch: 64: patch contains a line longer than 998 characters
(From OE-Core rev: f17f6b28ed2f62250f8690617e9126a43c3a8020)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If a commit is empty (for example, commits brought over from svn where
only properties were changed) then attempting to apply it with "git am"
will result in the error "Patch format detection failed", so skip it
instead.
(From OE-Core rev: 5754bc7bcc2f57b6b56e67e2900eeaab5bc184d8)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix some grammar.
(From OE-Core rev: cc34f1bf136409d2e31c443dd5334c3a35d208af)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If the config file is tracked within the combo-layer repository and it
is updated at the end of the "update" operation (because last_revision
has been changed), then automatically commit the file. This ensures that
multiple people can perform updates on different machines without the
last revision information going missing.
(If the file is outside the repository or is masked via .gitignore, this
will do nothing.)
(From OE-Core rev: 14f89acb43b0d9bec09b94668fbb056c7b5b1456)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix the dirty repository check to detect any changes, including
untracked files and uncommitted changes in the index.
(From OE-Core rev: f03fa8bbafa82ce6b09c08bf86011b6c51eb3531)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add an optional per-component branch setting to allow specifying the
branch instead of always using master.
(From OE-Core rev: 8e2b8b05607103acd539808c5ab0cc80c0d481fc)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Move all example configuration to the example config file, tidy up a few
long lines and fix some grammar.
(From OE-Core rev: ec099a32243ebc7eecd86e4bf40ed38da4af3fe5)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The "init" subcommand will now copy the current state of each component
repository into the combo layer repository, set last_revision for each
component, and then use "git add" to set up the initial commit (but will
not actually make the initial commit - that is left up to the user).
Also take the opportunity to bump the version number.
(From OE-Core rev: d4d491aa118b6cbe895167c62a46d883abc7b4ab)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The combo-layer tool had trouble handling merge commits as they were
included in the revision list but not the patches; these are now
excluded from the revision list. Note however that this will not handle
merge commits that resolved a conflict; since "git format-patch" cannot
construct a linear change history over such merges there is nothing we
can currently do with these.
(From OE-Core rev: b6b6b215675631d0e505ffc8b4890f85fb3169f9)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This script is used to enumerate which recipes are building
documentation. It does this by checking that a -doc package
gets generated and contains files.
The script works by building each recipe using the output from
bitbake -s.
It will generate several report files, listing which recipes
include documentation, which are missing documentation, and
which did not successfully build at all.
(From OE-Core rev: d5e5023c67dacf78cd3b6e3593777b30e5a8f05d)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* it needs to be regenerated to actually package something
(From OE-Core rev: 0a4ac566987950815fc1ae8a0ec0496bd42a46ed)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
and nfsroot mount without the need to talk to an RPC info
server as long as the port numbers for mountd and nfsd
are known in advance.
This patch updates the qemu startup scripts and the
user mode NFS server to have the ability to start
without the need to use rpcbind or portmap services.
(From OE-Core rev: 3b1346c607c41a2d592c48594457c32153cb2314)
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If a SOCKS5 gateway is needed for a proxy access like git it might also
require authentication to the proxy via a password and username. Adding
SOCKS5_USER & SOCKS5_PASSWD to BB_ENV_EXTRAWHITE allow for automation
of the authentication request to occur when something like a git fetch
is going through the proxy.
This patch requires the bitbake patch to add extra exportvars so
these variables get passed from Env -> bitbake -> fetcher
(From OE-Core rev: 9206ea0f7cd39d2ba6ff4b41cbeb17409d3ae5f1)
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The existing instruction to tackle
RPC: Authentication error; why = Client credential too weak
Are not applicable to ubuntu 11.10 especially
Therefore add the magic needed for ubuntu 11.10
(From OE-Core rev: faae191e8c1920745e0ea9abf7b8b26eb4561096)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The help2man script is pretty useless to us. It requires to run the target
binary to extract help information which is not possible for any of our
cross compiled target binaries.
We're not interested in man pages for -cross/-native tools.
It therefore makes no sense to have this as a core build dependency.
This patch removes the dependeny and replaces it with a script
returning false. This will trigger autotool's missing utility
to use the copy of the man page included with the sources which
is what would already happen when we tried to run cross compiled
binaries anyway.
(From OE-Core rev: 288343e30604b944dc18fd82172febd314d9c520)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update the internal copy of setup_tmpdir in the oe-setup-rpmrepo script
to be the same as the one in the runqemu script.
(From OE-Core rev: 4a23c4dd5ab31d9642e5e49569d5c7ab77e97adf)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
On OpenSUSE within an X session, TMPDIR is set to the system temporary
directory (/tmp) which is incorrect for these scripts. Thus, change
runqemu and oe-setup-rpmrepo to use OE_TMPDIR from the external
environment rather than TMPDIR.
Fixes [YOCTO #1530]
(From OE-Core rev: 4e24c10952c7a52af7f2447595fd484692d35534)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In the previous fix to this hook script (OE core revision
e7aae45414e4597e9244f86a81fbc940f73785c8) a start-of-line (^) marker was
missed, so if a commit had no Signed-off-by line but it contained an
inner patch that did, the inner patch was modified causing a "corrupt
patch" error.
(From OE-Core rev: 9f1b4e5923c60cd4215b0ca4da2cab6245e54ccb)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This refactors the way rootfs filenames are auto-detected when you
run the runqemu script without an explicit rootfs filename argument.
It allows the script to use rootfs files generated by hob, and when
there are mutliple rootfs files to choose from, it will pick the
most recently created one.
Fixes [YOCTO #1437].
(From OE-Core rev: 094453f443ed592d814dfb4182a0a02f0a2552e4)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If sudo is used in the pseudo environment, as done in image tests when
the user hasn't pre-setup the tap device, ensure the LD_PRELOAD error
message isn't seen by the user.
(From OE-Core rev: 86234ac514cbd33a0058f3b74f158daeda325c0d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Commit 993672fa2739794a6dd0dbd7bb232fa60522b897 removed the BUILDDIR
support from runqueue which broke the imagetest-qemu integration. We now
therefore need to set TMPDIR and pass this through the environment to
ensure the runqueue script finds the right locations without running
bitbake directly.
This patch also adds a sleep to the qemu command in the error case so that
this remains on the screen for a period of time so the user can see errors
more easily.
This change unbreaks automated testing failures on the autobuilder.
(From OE-Core rev: de470333dbdeea444199340e4cd458c13fed6a5a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If the wrapper script needs to build pseudo before we can launch hob we need
to notify the user so they aren't shocked by the action of launching a GUI
and seeing a bunch of text whiz by on the console.
Fixes [YOCTO #1435]
(From OE-Core rev: a160f4dd48b91c5e6f8c290c7572e29a39a3e693)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
hob now uses both a pre and post file, update the wrapper script to generate
and use both of these.
Addresses [YOCTO #1281]
(From OE-Core rev: b68f90b765e7c8923033ee7ff7746f39a2e91ff7)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The old manner of specifying custom options to QEMU in this script
using angle brackets was a frequent source of confusion. Meanwhile,
Otavio Salvador added a decent method of specifying custom kernel
boot options to this script. This patch documents the bootparams
option and adds a similar way of specifying custom QEMU options
using qemuparams="".
This fixes [YOCTO #1019]
(From OE-Core rev: 1038df14a96d789b3f9e9e1692305ba1fea67886)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Because unfs boot mode is unstable for qemuppc, disable
it temporarily.
(From OE-Core rev: 74ff1bc8c248824116ba4b787b10fa6ee0c13ce1)
Signed-off-by: Liming Wang <liming.wang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Because qemuppc has no graphic emulation, remove console=tty0
and make it run into 3 run level. This can reduce boot time
for qemuppc booting.
(From OE-Core rev: ba02844fd3c3e09b4c40bfff50c32bdcc27899fc)
Signed-off-by: Liming Wang <liming.wang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
combo-layer's hook scripts are intended to modify patches as they pass
through; the default one adds a prefix with the component name and
a line with the component repo revision before the Signed-off-by;
however the script was also unintentionally modifying the contents of
patches *within* the patches passing through it, which resulted in
unexpected failures when the combo-layer script attempted to use
"git am" to apply them.
(From OE-Core rev: e7aae45414e4597e9244f86a81fbc940f73785c8)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so.
Use a wildcard to match different locations, as uname -i only return unknown on Debian.
(From OE-Core rev: 66e34066a0ac71f4212824b1e6353a4d323f4e21)
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Decrease the similarity percentage needed to recognize a delete/add-pair followed by an edit,
as a rename.
This make reviewing patches easier.
(From OE-Core rev: 3944f5e02d22b70b3bcd733a80f005dbd8e248a2)
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
location of libGL has moved in ubuntu 11.10
so we look for it in the new locations
(From OE-Core rev: 8d80918995a15663db7cc9c0683d45ee8ba7d45c)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This small patch introduces a a very simple and basic way to script
the combo-layer conf file. With that a combo can be shared with no
need to change its config - associated to the use of environment
variables for example.
*Similar* to bitbake it considers every value starting with @ to be
a python script. So local_repo could be easily configured as:
[bitbake]
local_repo = @os.getenv("LOCAL_REPO_DIR") + "/bitbake"
or any more sophisticated python syntax.
This version updates the config file description so users can be
aware of.
(From OE-Core rev: 62269642ce0e0e56d68d495b6c4d27327c9ed649)
Signed-off-by: Leandro Dorileo <ldorileo@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The previous fix for a bug in Ubuntu 10.04 readlink,
be2a2764d8, notified the user when a trailing
slash was used. As there is no semantic difference, simply remove any
trailing slashes and proceed without nagging the user.
See [YOCTO #671] for more details.
(From OE-Core rev: 074ca832c0274e0e92698b4d006ef2708be105b8)
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Acked-by: Darren Hart <dvhart@linux.intel.com>
Cc: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This script has two problems today. First, it does 'ps -ef cmd'
in failure which real ps doesn't grok and busybox ps just ignores
the argument on. Switch that to 'ps -ef'. Second, busybox ps -o
doesn't understand cmd but does understand comm. Using comm lets
us simplify the test logic as well, so switch to that.
(From OE-Core rev: cb34ce6833f298d487eeb35cf8297f286ef624d4)
Signed-off-by: Tom Rini <tom_rini@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[YOCTO #671]
"readlink -f" in Ubuntu 10.04 is buggy: it doesn't ignore a trailing / (e.g.,
"readlink -f /tmp/non-existent-dir/" returns nothing, but according to
http://www.gnu.org/s/coreutils/manual/coreutils.pdf it should do that --
hence we get bug 671. It seems Ubuntu 10.10 or even later Ubuntu 11.04,
and other Linux distributions(e.g., Open Suse 11.4) haven't such an issue.
So I think we should detect this and ask Ubuntu 10.04 users to avoid supply
a path with trailing slash here.
Moreever, I also add the detection of non-existent path, e.g.,
source oe-init-build-env /non-existent-dir/build
can be detected and we'll print an error msg.
And, if we get errors in oe-buildenv-internal, we should stop the script
and shouldn't further run.
(From OE-Core rev: 651ccb3b031d9ccb8331505a51171372002230d9)
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Tom Zanussi
Paul Eggleton
Otavio Salvador
Richard Purdie
Saul Wold
Jiajun Xu
Martin Jansa
Scott Garman
Nitin A Kamble
Jason Wessel
Kumar Gala
Khem Raj
Joshua Lock
Liming Wang
Anders Darander
Leandro Dorileo
Dexuan Cui
Tom Rini