diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-09-10 13:51:43 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-09-10 13:51:43 +0000 |
| commit | 81ffc8a27d12a2b657b579ff382fe1baa1f3b1f9 (patch) | |
| tree | d26c40287ed706a2e352450bd81c9d21b78c7b65 /packages/linux | |
| parent | 03129ae071e7655514116ed870cccaae447ced19 (diff) | |
| parent | d7c51596650337b0f51c7a4ac2f6fae52bd01832 (diff) | |
merge of '89471c36d99620329016cb8c96d0637bd9403764'
and 'c74c9fb96051659da0f06ac95ab8f2656055d2a9'
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-omap/fix-install.patch | 23 | ||||
| -rw-r--r-- | packages/linux/linux-omap_git.bb | 17 |
2 files changed, 33 insertions, 7 deletions
diff --git a/packages/linux/linux-omap/fix-install.patch b/packages/linux/linux-omap/fix-install.patch new file mode 100644 index 0000000000..46bc25a50b --- /dev/null +++ b/packages/linux/linux-omap/fix-install.patch @@ -0,0 +1,23 @@ +From: Steve Sakoman <steve@sakoman.com> +Date: Mon, 18 Aug 2008 16:07:31 +0000 (-0700) +Subject: scripts/Makefile.fwinst: add missing space when setting mode in cmd_install +X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=f039944bdd491cde7327133e9976881d3133ae70 + +scripts/Makefile.fwinst: add missing space when setting mode in cmd_install + +This was causing build failures on some machines +--- + +diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst +index 6bf8e87..fb20532 100644 +--- a/scripts/Makefile.fwinst ++++ b/scripts/Makefile.fwinst +@@ -37,7 +37,7 @@ install-all-dirs: $(installed-fw-dirs) + @true + + quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@) +- cmd_install = $(INSTALL) -m0644 $< $@ ++ cmd_install = $(INSTALL) -m 0644 $< $@ + + $(installed-fw-dirs): + $(call cmd,mkdir) diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb index c596a95a71..085b2f6be3 100644 --- a/packages/linux/linux-omap_git.bb +++ b/packages/linux/linux-omap_git.bb @@ -6,19 +6,26 @@ KERNEL_IMAGETYPE = "uImage" COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm" -SRCREV = "b3f16ee00db9ec6b2ad53fc83fa913b42d3841be" +SRCREV = "2a4625ebb6538f9eef5d524b8e39e5c0c1316f9a" PV = "2.6.26+2.6.27-rc5+${PR}+git${SRCREV}" -PR = "r0" +PR = "r2" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" SRC_URI_append = " file://no-harry-potter.diff;patch=1 \ - file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \ file://timer-suppression.patch;patch=1 \ file://no-empty-flash-warnings.patch;patch=1 \ file://oprofile-0.9.3.armv7.diff;patch=1 \ + file://cache-display-fix.patch;patch=1 \ + file://4bitmmc.diff;patch=1 \ + file://no-cortex-deadlock.patch;patch=1 \ + file://read_die_ids.patch;patch=1 \ + file://fix-install.patch;patch=1 \ +" + +temporarely-disabled = " \ file://01-fix-timing-print.diff;patch=1 \ file://02-set-clkseld11.diff;patch=1 \ file://03-enable-overlay-opt.diff;patch=1 \ @@ -26,13 +33,9 @@ SRC_URI_append = " file://no-harry-potter.diff;patch=1 \ file://05-fix-display-panning.diff;patch=1 \ file://06-ensure-fclk.diff;patch=1 \ file://07-set-burst-size.diff;patch=1 \ - file://cache-display-fix.patch;patch=1 \ file://mru-clocks1.diff;patch=1 \ file://mru-clocks2.diff;patch=1 \ file://mru-clocks3.diff;patch=1 \ - file://4bitmmc.diff;patch=1 \ - file://no-cortex-deadlock.patch;patch=1 \ - file://read_die_ids.patch;patch=1 \ file://000-mru-make-video-mode-selcatable.diff;patch=1 \ file://001-mru-enable-overlay.diff;patch=1 \ file://002-mru-set-default-800x600.diff;patch=1 \ |