The commit breaks pkgconfig and after discussing it with the kmod and udev maintainers the conclusion was reached that putting the libraries in /lib instead of /usr/lib is not supported.
This reverts commit 6b74f2461735272bd950a4f060dab6e778a36f92.
(From OE-Core rev: 7163ebd92a799b8f000b2b6f303b20de468b5f90)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* PROVIDES does not need _${PN}
* CONFLICTS should be RCONFLICTS
* opkg needs RREPLACES to automatically remove older module-init-tools
instead of just reporting it conflicts with kmod
SHR root@gjama ~ $ opkg install kmod
Installing kmod (7+git02629fa02e96763db7460a930239cc93649a52f8-r0.0) to root...
Downloading http://jama.dyndns-home.com/org.openembedded.shr-core//armv4t/kmod_7+git02629fa02e96763db7460a930239cc93649a52f8-r0.0_armv4t.ipk.
Removing package module-init-tools-depmod from root...
update-alternatives: removing //sbin/depmod as no more alternatives exist for it
Removing package module-init-tools from root...
update-alternatives: Linking //sbin/insmod to ../bin/busybox
update-alternatives: Linking //sbin/modprobe to ../bin/busybox
update-alternatives: Linking //sbin/rmmod to ../bin/busybox
update-alternatives: removing //sbin/modinfo as no more alternatives exist for it
update-alternatives: removing //bin/lsmod as no more alternatives exist for it
update-alternatives: Linking //sbin/lsmod to ../bin/busybox
Configuring kmod.
update-alternatives: Linking //sbin/insmod to /sbin/insmod.kmod
update-alternatives: Linking //sbin/modprobe to /sbin/modprobe.kmod
update-alternatives: Linking //sbin/rmmod to /sbin/rmmod.kmod
update-alternatives: Linking //sbin/modinfo to /sbin/modinfo.kmod
update-alternatives: Linking //bin/lsmod to /bin/lsmod.kmod
update-alternatives: Linking //sbin/lsmod to /bin/lsmod.kmod
update-alternatives: Linking //sbin/depmod to /sbin/depmod.kmod
(From OE-Core rev: 8de7f8045f28aecfe796afcdb013c557ce9d1372)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This also helps avoid QA errors about binaries
accessing contents from /usr/lib
Also fixes emptry libkmod problem since now
the files are installed in expected place
(From OE-Core rev: 6b74f2461735272bd950a4f060dab6e778a36f92)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The linux-yocto repository and scripts can support a mode of
meta data management that merges a base meta branch to every
BSP branch. In this case, the scripts don't have to restore
a checkpoint for the meta data to be globally accessible.
The decision to restore or not is made based on whether or
not the meta branch is part of all branches or not.
The linux-yocto recipes have a sanity check to determine if
the requested SRCREV for meta data matches the head of the
meta branch (via do_validate_branches). If the wrong commit
is at the head, the meta branch is moved aside and the branch
reset to the right commit. This creates two meta branches that
contain the base meta data.
The test for integrated meta data mistakes this for a globally
merged set of meta data and doesn't restore the checkpoint, which
leads to build failures.
The immediate fix is to allow two branches to have the meta
data. The long term fix is to make the detection only consider
if the build branch contains the meta data.
(From OE-Core rev: bd794b92d12ceda2728520701e980b7a3cabd23d)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* until it's decided it should be installed in base_libdir or libdir
* fixes libkmod packaging
(From OE-Core rev: 87249372b4a9951f9e4dc6acece950718382a164)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the SRCREV to pick up two minor fixes:
1/2:
kgit-init: correct spelling of createme
kgit-init copies the kern-tools scripts and intends to copy createme.
The typo is in the usage() of updateme as well.
(From OE-Core rev: 043871d7e5d2d19c2ff43e54d2ff180c09e8903e)
Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
2/2:
kconf_check: fix bad quoting around missing_required.cfg
missing_required.cfg won't have it's path truncated (if applicable), since
the quoting it wrong.
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In order to support repositories of various types (with or without
meta data, branched, pristine, custom, etc) information about the
type of processing that is required was passed to the processing
phases via variables.
The combination of variables involved in coordinating the processing
creates a learning curve and overly complicates recipe extensions.
With minor tweaks to the kern-tools, adding flexibility and keying
off the existence of the meta branch it is possible to remove all
of the variables that were added to support different repository
types.
(From OE-Core rev: 06e5f45c8f38925cd5902a3a3f436f5e9451dd16)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the 3.2 SRCREVs to import the following meta/config
changes:
6b3d4e0 meta: add mei feature
519abac meta: add usb/uhci-hcd feature
a67c5a3 meta/crownbay: use usb features
0855066 meta: add usb/ohci-hcd feature
15f1a99 meta: add usb/ehci-hcd feature
8fa6408 meta: add usb/xhci-hcd feature
c724a55 meta: add usb/base feature
b55b3a1 sys940x: Cleanup sys940x.scc
93f2e97 sys940x: Use PHYSICAL_START of 0x200000 to boot
aaa034b sys940x: Add common standard and preempt-rt features
e2b1286 sys940x: Add efi-ext to standard and preempt-rt configs
d188c21 sys940x: Move emgd-1.10 data to the standard scc file
72d9369 fri2: Cleanup fri2-$KTYPE.scc files re efi-ext.scc
dbcb120 fri2: Use emgd-1.10 feature and branch
And the following driver fix:
f39a0a9 pch_gbe: Do not abort probe on bad MAC
(From OE-Core rev: 612047a20ca400b932ccc634ddb759460d69fdce)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the meta SRCREVs to pickup the following meta change for the
3.0 and 3.2 kernels:
[
meta: Clean up BSPs kernel config
Clean up some QEMU and non-x86 BSPs kernel config, including
qemuarm
qemuppc
qemux86
beagleboard
mpc8315e_rdb
Only obsolete/invalid kernel configs are removed.
(From OE-Core rev: 1f68d624c109c3f31a6f2f6106b5ef56e3d9a166)
Signed-off-by: Yang Shi <yang.shi@windriver.com>
]
With this commit, the configuration audit for the qemu and hardware
reference boards is (largely) warning free.
Signed-off-by: Yang Shi <yang.shi@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the meta SRCREV for both the 3.0 and 3.2 kernel trees to
pickup the beagleboard xM boot fix:
[
meta/beagleboard: disable CONFIG_PREEMPT
The boot hangs with the message:
mmc0: error -110 whilst initialising SD card
The MMC driver has issues initializing when PREEMPT is enabled (either forced
or voluntary). Unplugging and then plugging the card back will reset the
driver and continue booting. Alternatively, disable preemption.
]
[YOCTO: #1892]
(From OE-Core rev: 36e9e6a88bc4436efefd4a25c0a58be75f887142)
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In fixing an existing patch migration bug, the list of valid extensions
got out of sync from the core patch class. As a result, valid patches
were not being applied to the tree.
Updating the tools to migrate .diff files fixes the issue.
Also in this fix is the removal of .patch in the find_sccs() routine, since
it will never be returned by patch.bbclass when all non-patches are
requested, it is simply confusing.
(From OE-Core rev: 0ade3f26f40b67d7296725b1e956c46be9a86089)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This allows systemtap-uprobes to build again after the recently
added patch broke the builds.
(From OE-Core rev: 4bbe926f3ca68297d70849bab67177da624316d1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Building the systemtap documentation adds significantly to the build
time, so disable it by default.
(From OE-Core rev: e37391a949fb0a6edf87eb910e93a17caf309119)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When building docs in systemtap, docproc is used to generate the
tapset documentation, but it gets built for the target, while it needs
to be build for the host instead. This change causes that to happen.
Fixes [YOCTO #2193].
(From OE-Core rev: 6ef7112e339bb5c03dee862bc56c10fdf677be78)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
During testing/extension of the linux-yocto-tiny kernel it was found that
defconfigs were not always properly applied. This was due to two issues:
- not being able to fully control the order of objects applied to the
git tree on the SRC_URI
- defconfigs triggering --allnoconfig before being applied
To fix this, the recipe space code that previously detected and generated
automatic features moves back to the kernel tools (where it was before) and
is updated to also process .cfg and defconfigs. Moving this back to the
tools allow other recipes to automatically benefit from the additional
support.
The second issue is addressed by allowing configme to take --alldefconfig
when a recipe wishes to pass a defconfig and override the default
behaviour.
Fixes [YOCTO: 2250]
(From OE-Core rev: 08c368b9980716e459d846dd7183940a5bf8bea4)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the 3.2 recipe SRCREVs to pickup the following meta change:
[
meta: Add igb.scc to Romley
Romley machine has 82580 Giga bit Ethernet Controller.
Add the relavent Nic driver to it.
(From OE-Core rev: d7c567816bf828da34fb9e315d4d76c4181337e9)
Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com>
]
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The dtb files were not being installed into a location compatible with sstate and
the do_deploy task. This means in builds just using sstate, the dtb files disappeared.
This patch fixes the code to use the correct location for deploy files.
[YOCTO #2190]
(From OE-Core rev: 9815b7a95ac33d3234073cdd204d9389b4241189)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes [YOCTO #1501]
hello-mod is an example kernel module, and does not provide any real
functionality. As such, it would be better placed under meta-skeleton than
meta.
(From OE-Core rev: bde1744018afd4616e114b20ffdc21b9abddcedc)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Recent Linux kernel tries to load the libertas firmware with the version
string in its name first. This results in a delayed firmware load on
system boot. Keep the default libertas firmware name and add a link for
older driver versions.
(From OE-Core rev: baa1323dfff35ccd5aebc036ca97925a1f1a604e)
Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Migrate linux-yocto-tiny from 3.0 to 3.2. The 3.0 recipe was
based entirely on recipe-space fragments and was only a proof of concept.
The 3.2 linux-yocto meta-data now has a proper tiny KTYPE defined.
By default this recipe supports only the qemux86 machine, which builds the
common-pc support (including networking, sound, USB, VGA and serial consoles,
etc.). New machines can be added and will use the tiny KTYPE, but will need to
add any desired hardware support as the base config is very minimal.
No filesystems are supported by default, only the initramfs.
(From OE-Core rev: 44c556f5300b1d811a1ae71f501320d1a6b0fb2e)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the META SRCREV to pickup these commits:
59f350e meta: Add common-pc-tiny.scc
0996ca9 tiny: Minimize the tiny config
d6b57bb meta: common-pc add dependencies to cfg
Which update the configuration for the tiny profile of the kernel
for the 3.2 release.
cc: Darren Hart <dvhart@linux.intel.com>
(From OE-Core rev: df3b8f716cc9203251cd4d4b5e673d7ecab5111b)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the meta SRCREV to pick up this commit:
[
common-pc: Add PCNET32 to the config
Qemu and VM Ware both support PCNET32 and the latter requires it for
32 bit images.
(From OE-Core rev: 6b431f1a09abde57d03b799e57186afb9a572387)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
]
Signed-off-by: Darren Hart <dvhart@linux.intel.com>5A
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* show warning for old /etc/modutils/* files without .conf extension
* v2: keep adding modules also from old /etc/modutils/* after showing
warning, this way update-modules will be backward compatible also on
images without kernel upgrade
(From OE-Core rev: 38302a1353cf072b7c6c54f7f90936e4c2180102)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The linux-libc-headers-yocto is not required in oe-core, it can be
moved to yocto specific layers. The linux-libc-headers_* recipes
provide sufficient headers fore core users.
(From OE-Core rev: 6320041fa77514e2d2bf54f0ea6c7052d2a4a89a)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The 3.1 kernel was never released or directly supported via
oe-core. So as part of update the libc-headers to 3.2 we can
take the opportunity to remove it.
Built and booted on the qemu* targets.
(From OE-Core rev: ce7469ab3b49f8a326ba4c3486a4e63b7cd48799)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Change the recipe name lttng-ust from lttng-2.0 to lttng2-ust so that
that both the lttng-ust of the old framework and of the new framework
lttng-2.0 can coexist.
Fixed bug [YOCTO #2062].
(From OE-Core rev: 0d9fc8185945328837aa1a3d9d705afa56856853)
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update blktrace to reflect the newer 1.0.5 tag.
(From OE-Core rev: c981fa4fad8a457882293157b7bdca05aad5a778)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
recent -stable kernels have their own fallback definition of is_compat_task
#define is_compat_task() (0)
To protect against this double definition of is_compat_task we can check
to see if it is already defined, and skip the lttng variant.
(From OE-Core rev: 53db58982b7af59d75fc11b73475e9d71e6927ac)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the meta and machine branches to the latest 3.0 -stable
release.
To see the full changelog: git log v3.0.23..v3.0.24
(From OE-Core rev: 7ed5780cbae6b60adeb56d4d3deb0b82c2dfec70)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the 3.2 meta and board branches to the latest 3.2-stable
update.
(From OE-Core rev: 5de1757cc139565b02c6c56b4aa78a2401b42aa9)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Bumping the meta SRCREV to pickup the following change
fri2: Update fri2.cfg for hardware specific support
The FRI2 does not require R8169 or PATA support. It does not need SFF
or GENERIC ATA options either.
The FRI2 does require IEEE802154 (Zigbee), BT (Bluetooth), and IWLWIFI.
The latter is compiled as a module to avoid the need for an initrd
containing the firmware blobs.
(From OE-Core rev: 97c21129819ee7a3091757879cd2f0b8133f12e7)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Bumping the meta branch for two changes:
cac43c1 fri2: Update fri2.cfg for hardware specific support
892bd13 meta: Create scc file for pvr merge
(From OE-Core rev: 8d1ed5e42358bd33442a6038a9f3931c827bdf94)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The packaging changes to ncurses could break package feeds,
so bump the PR on everythong that DEPENDS on ncurses.
(From OE-Core rev: be92256917c157284ef8370bb93bbf443849b2e1)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The kernel configuration requires lzma to compress the kernel image
(CONFIG_KERNEL_LZMA=y), so add a dependency on xz-native which provides
it.
Fixes [YOCTO #1728].
(From OE-Core rev: e1f656492475fb65d1203afe0afeeec7e279a317)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* The previous copy command preserved the original
owner and permission bits.
* The new command uses root:root and applies OE's
umask.
(From OE-Core rev: 710e565beadcf4ea965af688fd08b9b1f274ad57)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Adding "GPLv2 & LGPLv2.1" to create a dual license to cover the libraries.
* Bump up PR
(From OE-Core rev: 468aab48b07d345aadb6f449421824b0447d29c2)
Signed-off-by: Jeff Lance <j-lance1@ti.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Bumping the -rt kernel to pickup the incremental update to -rt16.
No major changes from -rt15, except for a bug fix that we want
to pick up.
(From OE-Core rev: 0b03c2382ad6b2d472555f5054a1ce82eb4e3de9)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the meta SRCREV to pickup the following fixes:
a9ffedb meta/fri2/sys940x: fix incorrect cfg includes
3d1a678 meta/sys940x: fix incorrect emgd branch merge
During the merge of the 3.0 BSPs forward to 3.2, a few moved config
fragments were missed.
(From OE-Core rev: 51c0c1d07d44b3bffb63d15b6befff6e7ba2549f)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is an update of the linux-yocto 3.0 and 3.2 SRCREVs to bring
in the following updates:
- v3.0.23 stable update
- v3.2.9 stable update
- 3.0/3.2: fri2 updates (pch + configuration changes) from Darren Hart
- 3.0: pvr merge from Kishore Bodke
- linux-yocto/rt: update to 3.0.23-rt38
- linux-yocto/rt: update to 3.2.9-rt15
These have been built for all qemu targets, and built for the appropriate
hardware platforms.
(From OE-Core rev: a9e7131b85e1787e6f76c64d77b2ac6684c8a9c9)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Instead of specifying nocheckout=1, it provides a better workflow if
the linux-yocto recipes use the new bareclone=1 option to get a mirrored
copy of the source repository. This allows all local and remote branches
to be available during the kernel build and development cycle.
(From OE-Core rev: 2281e14a342639bfd2656ffa220dc023168cb35e)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Using "1" with getVar is bad coding style and "True" is preferred.
This patch is a sed over the meta directory of the form:
sed \
-e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \
-e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \
-i `grep -ril getVar *`
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3.2.8 was released and contains a floating point fix for x86 32
bit and some x86-64 fixes. So it's worth picking up right away.
(From OE-Core rev: 8bd3038b62eaf46f9ac09fcdc1ca5e6f6e53a126)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the 3.0 and 3.2 kernel SRCREVS to make the PVR feature
description available to machines with the appropriate hardware.
(From OE-Core rev: 0027bb45a40d209f43088e2c2b38191446ea1190)
Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
