[PATCH 0/4] patches for olpc-2.6:xo-v2.6.30 branch
Martin Dengler
martin at martindengler.com
Mon Jun 29 23:42:59 EDT 2009
Hi Deepak,
Here are four patches for the olpc-2.6 repo's xo-v2.6.30 branch. Two
patches are effectively cherry-picks from the xo-1.5 branch and
hopefully will be uncontentious. Please let me know if the patches
need improving so as to make them acceptable for applying to the
xo-v2.6.30 branch.
You can see them in my olpc-2.6 tracking repo at
http://dev.laptop.org/git/users/mdengler/olpc-2.6/log/?h=xo-v2.6.30 if
that's more convenient. You can see the kernels I've built using
these commits at: http://dev.laptop.org/~mdengler/xo-1/ .
The kernels install and boot fine on my XO-1 running F11/SoaS.
1) the first patch I used along the way to sniff out the undefined
kconfig var patched in #2. The change is trivial but might save some
time in the future:
my commit 5bb442db56e704cf184a56b61ad03ae1e9a5e1f9
don't be quiet during make silentoldconfig
2) cherry picked from f77a1366c6ae489eba7b063979b0905403bb1922 (cjb)
and extracted a minor, previously-undefined kconfig var that needed
setting (fixes "make olpc-kernel-rpm" breaking):
my commit b80a9cb146579b30343308e871184fba98210e08
configure CONFIG_FCOE_FNIC as 'not set'
3) cherry picked from 9213b4116406ded25bde52888f84c7c4c37e44cc (cjb):
my commit 9213b4116406ded25bde52888f84c7c4c37e44cc
Trac #9338: ext4=y
4) The fourth patch I had to do to enable a kernel-firmware rpm build;
this seemed necessary so that an F11 machine (whose kernel-firmware
rpm conflicts with our combined kernel + firmware rpm) will "yum
update" to this OLPC kernel. This is not as frivolous as it might
sound, since not only is this required for "yum update" but also for a
clean kickstart / livecd build. Heretofore I/we have been just using
rpm --force --nodeps tp install XO-1 olpc-2.6:v2.6.30 kernels, but
this seems uglier than necessary.
my commit 0a2cfe49d7ad79f9134d50a8334f9af7b37034e4
add with_firmware option to play nice with F11 kernel-firmware rpms
Again, please let me know if I can improve these patches so as to make
them acceptable for applying to the xo-v2.6.30 branch.
Martin
PS - below is the diffstat from git format-patch --cover-letter:
Chris Ball (1):
Trac #9338: ext4=y
Martin Dengler (3):
don't be quiet during make silentoldconfig
configure CONFIG_FCOE_FNIC as 'not set'
add with_firmware option to play nice with F11 kernel-firmware rpms
arch/x86/configs/olpc_defconfig | 9 ++++++++-
olpc/SPECS/olpc-2.6.spec | 39 ++++++++++++++++++++++++++++++++++++---
2 files changed, 44 insertions(+), 4 deletions(-)
More information about the Devel
mailing list