summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cracklib: cracklib-native should not depend on zlibKonrad Scherer2013-12-121-1/+1
| | | | | | | | | | | (From OE-Core master rev: 89d7d46947d9bb8c7bf568c65e52d5bbe159027f) (From OE-Core rev: 7c6504c6c059ba6b37f88143801ac8137267cf83) Signed-off-by: Konrad Scherer <Konrad.Scherer@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* nfs-utils: nfsserver restart should kill and recreate nfsd kernel threadsQiang Chen2013-12-121-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nfsserver restart without killing kernel threads worked when portmap was the rpc publishing process and portmap was restarted. When rpcbind replaces portmap, nfsserver restart in this way does not work after an rpcbind restart. Steps to reproduce: 1). Make ext3 filesystem image on local host. cd /root dd if=/dev/zero of=test bs=1024K count=50 mkfs.ext3 -F test 2). runqemu qemux86-64 mkdir /mnt/wrtest mount -t ext3 -o loop test /mnt/wrtest echo "/mnt/wrtest *(sync,rw,no_subtree_check,no_root_squash)" > /etc/exports /etc/init.d/rpcbind restart /etc/init.d/nfsserver restart showmount -e localhost mkdir wrtest mount -t nfs localhost:/mnt/wrtest wrtest mount: mounting localhost:/mnt/wrtest on wrtest failed: Connection refused Modifying the nfsserver script to kill and restart kernel threads on restart makes the problem go away and is consistent with current RHEL/SUSE and Ubuntu/Debian mechanisms of handling the nfs server. (From OE-Core master rev: 1a96b8d7dfc490fc61bbd470a8b09065750cd563) (From OE-Core rev: d1b5e944656807c9db9cbe5d08d7b4bd8daeb826) Signed-off-by: Rich Dubielzig <rich.dubielzig@windriver.com> Signed-off-by: Qiang Chen <qiang.chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* nfs-utils: Stop rpc.statd correctlyQiang Chen2013-12-121-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An incorrect process name in the nfsserver initscript prevented rpc.statd from being shut down. root@qemux86-64:~# /etc/init.d/nfsserver start creating NFS state directory: done starting 8 nfsd kernel threads: done starting mountd: done starting statd: done root@qemux86-64:~# ps | grep rpc.statd 650 root 10532 S /usr/sbin/rpc.statd 654 root 4720 S grep rpc.statd root@qemux86-64:~# /etc/init.d/nfsserver stop stopping statd: done stopping mountd: done stopping nfsd: done root@qemux86-64:~# ps | grep rpc.statd 650 root 10532 S /usr/sbin/rpc.statd 662 root 4720 S grep rpc.statd As this daemon drops a pid file,simply use that instead. Also add some initialization checks so the daemons are not left partially started in the absence of kernel nfsd support. (From OE-Core master rev: 37e70a28e9cfc773bd70f09d7129295ce891ae18) (From OE-Core rev: 5f22bad97a3bacb87cefb54ffd785d359c58aec0) Signed-off-by: Andy Ross <andy.ross@windriver.com> Signed-off-by: Qiang Chen <qiang.chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* perf: flag __SANE_USERSPACE_TYPES__ to include int-ll64.h for mips64Wenzong Fan2013-12-121-1/+2
| | | | | | | | | | | | | As the same reason to powerpc64, mips64 also need the flag. (From OE-Core master rev: d6f3cb0d71c3b6739365f085b6d5a5e20f329fa5) (From OE-Core rev: 9c4b604ea0d81bc1de224b35ae160f87be6bcf7b) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* relocate_sdk.py: Allow script to work with Python 2.4 and 3.Konrad Scherer2013-12-121-17/+25
| | | | | | | | | | | | | | | | | | Python 2.4 does not support the 'b' string literal or the keyword 'as' in exception handling. Python 3 does not accept the old method of exception handling and defaults to unicode. The b() function converts strings to bytes on Python 3 and using sys.exc_info() avoids the exception handling syntax. (From OE-Core master rev: 1e2ec5f576f167673d7980737826987fefdc74a9) (From OE-Core rev: 343127f2f81be337596d3eacbbc92278e82ce574) Signed-off-by: Konrad Scherer <Konrad.Scherer@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu-extract-sdk: add --numeric-owner option to tar commandChen Qi2013-12-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the same username exists on both target and the build host, but the uids differ, and we start target via NFS, then the uid for the user will be incorrect on target. For example, if postfix's uid on host is 119 and on target is 1024, then if we start target via NFS, the uid for postfix will be 119. The root cause is that when we use runqemu-extract-sdk to generate the NFS rootfs for later use, the tar command will respect the username instead of uid. So if PSEUDO_PASSWD environment is not set correctly, the host /etc/passwd will be used, resulting in wrong uids. The situation for gid is completely analogous to that of uid. It's almost impossible for the runqemu-extract-sdk to guess the correct location of the needed password file merely based on the target tarball name. This patch solves this problem by adding the '--numeric-owner' option to the tar command so that the uid/gid will be used when extracting the tarball using runqemu-extract-sdk. In this situation, we'll always get the correct uid/gid after extracting the tarball. [YOCTO #5364] (From OE-Core master rev: acce6ff1a77cfd29e3868faa89b120becb58bbbf) (From OE-Core rev: c2baac739a521d1edd408a24f6b1fece8f755218) 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> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* packagegroup-base: if zeroconf DISTRO_FEATURE enabled, add libnss-mdnsRoss Burton2013-12-121-0/+1
| | | | | | | | | | | | | | | mDNS name resolution is a key part of mDNS, so if the DISTRO_FEATURE is enabled then install libnss-mdns. (From OE-Core master rev: ef2ee68778be8e5336cd33ab6551bce1d56047b6) (From OE-Core rev: fb72bebc999aef7bb006a7ba273eaa96376a4016) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* base.bbclass: fix nondeterministic PACKAGECONFIG processing orderChristopher Larson2013-12-121-1/+1
| | | | | | | | | | | | | | | | | The PACKAGECONFIG flags were iterated over using dict.items(), but this returns the items in an undefined order. As this order determines the EXTRA_OECONF append order, we can get EXTRA_OECONF which are functionally equivalent, but whose contents differ, resulting in not using shared state archives we should be using. (From OE-Core master rev: 843a5dd8f8f0461e286d9fdb3ba55205b4275f88) (From OE-Core rev: 73f77c195e1af3df594eecce2cab47ee963d5c2e) Signed-off-by: Christopher Larson <kergoth@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* midori: exclude from self-hosted for mips64Jackie Huang2013-12-121-1/+5
| | | | | | | | | | | | | | | midori depends on webkit-gtk which could not build for mips64. [YOCTO #5141] (From OE-Core master rev: abadeb934d4f41288c4fde6a4e5df2b124326326) (From OE-Core rev: 672cd50a39a697b53c337a79c34fab05b48e0920) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* initramfs-framework: fix test that filter backup module filesMichaël Burtin2013-12-121-1/+1
| | | | | | | | | | | | | | | Test that filter backup module files (files starting with ~) was accidentally reversed in e6039e6e3b98d6ab91252a5012d76279b1fac6e8, this patch restore initial behavior. (From OE-Core master rev: b2eb846ee12989add7a7ca8bbf45f293a3a7e56d) (From OE-Core rev: 00ff958fec53e55cc475c1b31fb9813d97872ceb) Signed-off-by: Michaël Burtin <michael.burtin@innotis.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: Update and generalize pseudo setup for rootfs generationTom Zanussi2013-12-121-13/+15
| | | | | | | | | | | | | | Remove unnecessary pseudo exports i.e. PSEUDO_DISABLED and move the setup to the top-level prepare_rootfs(). (From OE-Core master rev: 4bf11cd7d7301da664c098c8a0ae9c0294a6f423) (From OE-Core rev: 8d661f578276c70e1671edfc810aa4dad97de970) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: Make find_binary_path() more user-friendlyTom Zanussi2013-12-121-1/+4
| | | | | | | | | | | | | | | | find_binary_path() is useful, but if the binary isn't found, it prints a stacktrace and a less-than-useful message. Users complain when they get stacktraces for things they can act on, so remove the stacktrace and tell the user what the problem is. (From OE-Core master rev: 0d9eef0eaa267500e8eedab8b72ddf24eb0516db) (From OE-Core rev: 8a17195c9be38815e9ae431bcb18f66a4ad2cdcb) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: Remove binary dependenciesTom Zanussi2013-12-121-4/+0
| | | | | | | | | | | | | | Current functionality doesn't make use of kpartx, mount, or unmount, and we use native mkswap, so remove the binary checks for those. (From OE-Core master rev: 76293d2d6bbdeacd7b34f39f26fb97c3d7f9496f) (From OE-Core rev: 0ed290b81e1c3b781170033f50db01ddfff14784) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: Remove rpmmisc call from livecdTom Zanussi2013-12-121-1/+1
| | | | | | | | | | | | | | | | | | We don't currently use LiveCDImageCreator, but it makes calls when initialized via the plugin interface to rpmmisc module functions, which we don't want the dependency on. To make it (and LiveUSBImageCreator) happy, we give it the dummy "i386" value for now. (From OE-Core master rev: e10ae516cfc10900ed12e84c743e3a7127372135) (From OE-Core rev: a3cc57cf3116c997ec11dd3cbfa3b0d615e5dabc) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: Remove rpm and grabber dependencies from BaseImageCreatorTom Zanussi2013-12-121-3/+1
| | | | | | | | | | | | | | | | | | | | BaseImageCreator is a base class for DirectImageCreator and others, and imports rpm and grabber (which imports rpm). The various plugins e.g. DirectPlugin import the creators and therefore these dependencies, which manifest at run-time as e.g.: Warning: Failed to load plugin imager/direct_plugin: No module named rpm (From OE-Core master rev: a1e24c4a5f5771b7ad35e53ce96c6d82212e4d7e) (From OE-Core rev: f5587ec7e7f925b321b9bfe6923be0879dadb2aa) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: remove rpm warning code from BackendPluginTom Zanussi2013-12-121-5/+0
| | | | | | | | | | | | | | We don't currently use rpm functionality, so we don't need to silence rpm warnings. (From OE-Core master rev: dd3cc03d4fa3347f8ef2db23d8ff98bdbdb73baa) (From OE-Core rev: 8827b46d8cb4d6918451bd1c3c278465d8796e4b) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: Remove dependency on myurlgrab moduleTom Zanussi2013-12-121-1/+0
| | | | | | | | | | | | | | | mylrlgrab is in grabber, which imports rpm. For current functionality, we don't need to grab urls or import rpm, so remove the dependency. (From OE-Core master rev: 429ecc2afa499df35a1ae9da6f92b88c6f2d8d11) (From OE-Core rev: 1ef27c9dfa28f65458750c0afb2e136c4b79b226) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: Remove dependency on rpmmiscTom Zanussi2013-12-123-3/+2
| | | | | | | | | | | | | | | | rpmmisc imports rpm and contains misc rpm utilities related to packaging and determining arches based on the packaging. We should never run across this in the initial version of wic, so remove the dependency. (From OE-Core master rev: 2d59b6eeb418cf23eef3e32b43354b4ab16a40b9) (From OE-Core rev: b16a9de9f5eb2d252ee263a4b2c66c74ff4ff78f) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: eliminate module checksTom Zanussi2013-12-121-10/+0
| | | | | | | | | | | | | | We're removing all external dependencies including rpm and urlgrabber, so we don't need this check. (From OE-Core master rev: 429c0d72b9b8bfed34832e283be92996e074b9ac) (From OE-Core rev: 898285fbe172e0e77f0986be8f5187f86bfca95b) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: Remove dependency on rt_util moduleTom Zanussi2013-12-127-7/+7
| | | | | | | | | | | | | | | | | | | | rt_util contains bootstrap_mic(), which imports rpm and other things we don't need because we don't do bootstrap i.e. runtime (set in wic.conf) is always set to 'native', which means use what's on the local host. bootstrap mode is for downloading and installing rpms that wic needs, which we may want to implement later; for now, we just want to use what's local. (From OE-Core master rev: 3103f0cb908eced7b751128c2bba898d12017c80) (From OE-Core rev: f338d696b7f865bdb10020f806c69c78e8ed6625) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: add pseudo to the populate-extfs stepTom Zanussi2013-12-121-1/+8
| | | | | | | | | | | | | | Without this, files in the generated filesystem pick up the wrong ownership. (From OE-Core master rev: 24a6b1324965080fef6c363edcb37768090eebea) (From OE-Core rev: ecdc5422bd3e3efbf46c3d12d0a95d9f736a6d27) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: Initialize return values in find_artifacts()Tom Zanussi2013-12-121-0/+2
| | | | | | | | | | | | | | If one of these isn't found, it won't be initialized and will throw an UnboundLocalError. (From OE-Core master rev: ce6c3ec0e5f4822e85b8f957e9e31fa9de438c55) (From OE-Core rev: 9bf229c7b66bda4fb52f53d6f7f6b86f10dc8681) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: Check for the existence/correctness of build artifactsTom Zanussi2013-12-121-0/+20
| | | | | | | | | | | | | | | If a user uses the -e option and specifies a machine that hasn't been built or uses the wrong .wks script for the build artifacts pointed to by the current machine, we should point that out for obvious cases. (From OE-Core master rev: a5b9ccadc0603c70c65f74fa386995c585a951db) (From OE-Core rev: 54e0b423852580c62b43c5ead00f431b971bea1a) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* crond: remove UID check in init scriptJack Mitchell2013-12-121-8/+0
| | | | | | | | | | | | | | | | this init script fails when the default shell is busybox sh. This is because busybox sh doesn't set the UID. No other init scripts in oecore feel the need to check the UID so just remove the check. (From OE-Core master rev: dd6a45536043af34c05a699e468cef4845f7affd) (From OE-Core rev: 11385321982411d3d1c2aa663b2b2d195c74f353) Signed-off-by: Jack Mitchell <jmitchell@cbnl.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* perf: flag __SANE_USERSPACE_TYPES__ to include int-ll64.h for powerpc64Ting Liu2013-12-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | PPC64 uses long long for u64 in the kernel, but powerpc's asm/types.h prevents 64-bit userland from seeing this definition, instead defaulting to u64 == long in userspace. Perf want LL64, flag __SANE_USERSPACE_TYPES__ to get int-ll64.h. Fix the below issue: | tests/attr.c:71:4: error: format '%llu' expects argument of type 'long long unsigned int', but argument 6 has type '__u64' [-Werror=format=] | tests/attr.c:80:7: error: format '%llu' expects argument of type 'long long unsigned int', but argument 4 has type '__u64' [-Werror=format=] | attr->type, attr->config, fd) < 0) { | ^ (From OE-Core master rev: e0b56f7ed84da4f71f448548e15d5a75e8eada6e) (From OE-Core rev: 7d55375ddc1a928e77d5687a8e7b36eecb91c594) Signed-off-by: Ting Liu <b28495@freescale.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* initscripts: insure checkroot.sh runs before anything writing to the fileJeffrey C Honig2013-12-121-1/+1
| | | | | | | | | | | | | | | | | | | If bootlogd was configured to write to a log file on the root file system, the checkroot.sh was not able to change the rootfs to read-only because bootlogd was started earlier and had a file descriptor open. Lowering the order of checkroot.sh ensures that the volatile filesystem is set up before anything writes to it. (From OE-Core master rev: 13c9bc143f6861517970dafdc7e7a45740d0933d) (From OE-Core rev: e54864e6db9fddb8ec98e323fe6da88e02ff070a) Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com> 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> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cairo: add explicit dependency on zlibRoss Burton2013-12-121-1/+1
| | | | | | | | | | | | | | | | In normal use this is pulled in through libpng, but it's exposed in the headers of cairo-pdf and cairo-ps and a build from sstate can end up without zlib being present. (From OE-Core master rev: 8413bf1ce95802bff032b4592ca1aa4728d62cbf) (From OE-Core rev: 252896140bb107315e58bbd82b9a73528da9b860) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kmod: Add patch to fix seperate build dir of ptestSaul Wold2013-12-122-0/+35
| | | | | | | | | | | (From OE-Core master rev: 68322eadd1d9456e606b375c2f4181725784c292) (From OE-Core rev: ed94da7c1fbb39eb7f28d50d61d2d254892a5df8) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cross-canadian: Fix SHLIBSDIR when using multilibRichard Purdie2013-12-121-0/+5
| | | | | | | | | | | | | | | | | Both nativesdk and multilib use MLPREFIX for their partciular purposes. When we have both set, cross-canadian can confuse SHLIBSDIR. This forces the variable to the correct value for cross-canadian, fixing toolchains in multilib builds. [YOCTO #5333] (From OE-Core master rev: 0633b93086a7de7226f4dc6ca403ee116bc58669) (From OE-Core rev: 003ddbccb260cdbfc6c1ff9e576a0584b0f25378) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* nativesdk: Fix pn checkRichard Purdie2013-12-121-1/+1
| | | | | | | | | | | | | There are missing brackets in the check meaning MLPREFIX doesn't get set for nativesdk-qemu-helper when it should be. (From OE-Core master rev: 5011f4bc8a418d0616d2936b60ecb7ca156632a3) (From OE-Core rev: 48b4bb2f98a1b7b97688071af4c2d3ee390b6ab3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: Check for external modulesDarren Hart2013-12-121-0/+12
| | | | | | | | | | | | | | | | | | | | | | Since eight unique files import rpm, perform a check at the top level for the existence of the rpm module print a sensible error message if it is not. This may be able to be removed if some of the core rpm dependencies are removed from the mic libs. Also check for urlgrabber. This avoids a bracktrace in the event the modules are not installed which can be very off-putting to would-be users. (From OE-Core master rev: b11bfadba20c1f39a63e396e605a8316c2ed2a94) (From OE-Core rev: 93b1d54bf377703cd0c7debce21b07b4fbf4e5a5) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Cc: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: Force lba off for FAT16 partitionsDarren Hart2013-12-121-0/+10
| | | | | | | | | | | | | | | | | If fat16 is specified to the mkpart parted command, parted will default to setting the lba flag which causes certain EFI firmware to fail to detect the filesystem. lba shouldn't be necessary for FAT16 filesystems anyway, explicitly disable it. (From OE-Core master rev: 30442d432e203e655b7d40b93f7307f475de1614) (From OE-Core rev: e437cd5ccaa44798107a6aa5177b1b867c94dfc3) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Cc: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Add depmod (adds 2240 bytes)Saul Wold2013-12-121-1/+1
| | | | | | | | | | | | | This will allow packages that update kernel modules to run correctly (From OE-Core master rev: 72c23255cc88b5e2cd6f783231e6f42bf5190df7) (From OE-Core rev: bce32a41c7e700f49aaa0aacbeb6c83d91a8b255) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: check passed-in build artifact directoriesTom Zanussi2013-12-121-0/+12
| | | | | | | | | | | | | Make sure they exist - complain if they don't. (From OE-Core master rev: 24a585e3fd0ea0166991a6aa834bba15bcd8295d) (From OE-Core rev: 4565512015d257e492d7fbb9e28c6086111d892d) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: check for build artifactsTom Zanussi2013-12-121-0/+8
| | | | | | | | | | | | | | wic needs to be given one form of build artifacts or another - complain if the user doesn't do that. (From OE-Core master rev: 9116a17efd42447f276000927d0c2ea63776865b) (From OE-Core rev: f9b9b920dc071b0798cbdaa150314a0126d2afad) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* pango: fix x11 DISTRO_FEATURE checkRoss Burton2013-12-121-3/+2
| | | | | | | | | | | | | | | | --without-x was removed in 1.32.0, so the correct option is now --without-xft. Also remove --disable-glibtest, as configure.ac doesn't invoke that test. (From OE-Core master rev: e806f4ff404515f38318b6fed7d2b614c2138da6) (From OE-Core rev: 147eac9794bd815f7f10002beacbe47302352ca4) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: add upstream QTBUG-31579 patch for QPainter regressionJonathan Liu2013-12-122-0/+49
| | | | | | | | | | | | (From OE-Core master rev: a5afc67cbfc32beb3be10392bf9788cfc3610ab1) (From OE-Core rev: 18e49ebf8d5cc43eca417cd51cabae175f6b5ea4) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* xorg-lib-common: fix malloc0returnsnull usageRoss Burton2013-12-121-2/+3
| | | | | | | | | | | | | | | | | | | | | Xorg libraries that use Xmalloc need to know if malloc(0) returns NULL or not, and as this is a runtime test it can't be checked for. Previously xorg-lib-common declared that malloc(0) did return NULL, but this isn't true for eglibc (only uclibc). Instead, use libc-specific overrides to pass the relevant option. (ideally the check would use the autoconf cache so this can be stored in the site files) (From OE-Core master rev: e628c8aba0189de30de2833882b9999ff3b6547a) (From OE-Core rev: 93e084ae8bcae8e7bde5a7e52a274a39dc9ba509) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sysvinit-inittab: Fix getting tty device name from SERIAL_CONSOLES entriesMuhammad Shakeel2013-12-121-1/+1
| | | | | | | | | | | | | | | | | Currently the part after "tty" in the device name go into label along with everything after that part. For example if SERIAL_CONSOLES="115200;vt100;ttyS0" than label=S0 but if SERIAL_CONSOLES="115200;ttyS0;vt100" than label=S0;vt100. If SERIAL_CONSOLES="..;ttyX;..", part after 'X' should also be trimmed. (From OE-Core master rev: b00b9ae5693e04cacd0843c12a529e7f3dc501ed) (From OE-Core rev: e807747f28798b080bf13a65293ab04c8d83834c) Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kmod-native: use bswap to work on older Linux hostsTing Liu2013-12-122-0/+40
| | | | | | | | | | | | | | | | | We can't use htobe* and be*toh functions because they are not available on older versions of glibc, For example, shipped on Centos 5.5. Change to directly calling bswap_* as defined in byteswap.h. (From OE-Core master rev: 63edb6b9a8bdf2f5541edd618f2f598185e37223) (From OE-Core rev: 2e791639625746037626e348cfac4ad1109bb9ae) Signed-off-by: Ting Liu <b28495@freescale.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* device_table-minimal.txt: change group of /dev/hda back to diskChen Qi2013-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | | The group for /dev/hda should be disk instead of root. The group ID for /dev/hda was 6, but it was modified to be root by accident in the following commit. commit c5ef0294a9b8d178896a47c9f5d6e3dd6797e343 device_table-minimal.txt: use user/group names instead of uid/gid This patch changes it back. (From OE-Core master rev: 5c5db302400894c2bb1f4052d0f120738589c128) (From OE-Core rev: aaaba8d087bd4186cd2e309b962d62f240f96b98) 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> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ref-manual: Added new SDK_DEPLOY variable description.Scott Rifenbark2013-12-111-0/+15
| | | | | | | (From yocto-docs rev: a49e265083467e79e12f729d7f23c5ffc5a0c22f) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ref-manual: Added more info to distrodata class.Scott Rifenbark2013-12-111-0/+20
| | | | | | | | | | Saul Wold provided me with more detail on this class, which I added. (From yocto-docs rev: 73c79f0460511039d5497bfd303cdc88f96e2fcc) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ref-manual: Added more info to gnomebase class.Scott Rifenbark2013-12-111-0/+5
| | | | | | | | | Ross Burton provided an expanded explanation. (From yocto-docs rev: 3d867803d03c22499c0be3a27a2ffac3b0a5854a) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ref-manual: Fixed some broken cross-references.Scott Rifenbark2013-12-111-3/+3
| | | | | | | | | | | | | Three broken cross-references to the "qmake_base" class existed in the variables chapter. The actual class "qmake_base" is listed as part of the "qmake*" class so there is no tag taking a user to the exact "qmake_base" class. Changed the tag to "ref-classes-qmake*". (From yocto-docs rev: 96c92e7a26afefbce16a723a071fa203d70ce547) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ref-manual: Fixed double word error in EXTRA_QMAKEVARS_PRE variable.Scott Rifenbark2013-12-111-1/+1
| | | | | | | (From yocto-docs rev: 855de90887750bc5811dfb1da51edb342f831c67) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ref-manual: Fixed double word in EXTRA_QMAKEVARS_POST variable.Scott Rifenbark2013-12-111-1/+1
| | | | | | | (From yocto-docs rev: 575c611a8c78e6f9c9eeba143c12425b8f648396) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ref-manual: Edits to QMAKE_PROFILES variable.Scott Rifenbark2013-12-111-7/+7
| | | | | | | (From yocto-docs rev: 781f18ca3948ead3f3153f593f63e06f4a7501af) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ref-manual: Fixed typo in PACKAGE_CLASSES variable.Scott Rifenbark2013-12-111-1/+1
| | | | | | | (From yocto-docs rev: 106471227a8d9ad073207f601a78b059d7f10361) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ref-manual: Edits to the IMAGE_PKGTYPE variable.Scott Rifenbark2013-12-111-0/+5
| | | | | | | | | | | Added a note at the bottom clearly stating TAR files are never used as a substitute for RPM, DEB, or IPK files when generating your image or SDK. (From yocto-docs rev: 5bc911ce2d13a19744aa800133a5ca4c8fba98b2) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>